[Flightgear-cvslogs] CVS: data/Aircraft/ufo ufo-set.xml,1.24,1.25 ufo.nas,1.16,1.17

[Melchior F. <mf...@fl...>]

Update of /var/cvs/FlightGear-0.9/data/Aircraft/ufo
In directory baron:/tmp/cvs-serv31189

Modified Files:
	ufo-set.xml ufo.nas 
Log Message:
whoops ... /model is already reserved -> name it back to /cursor


Index: ufo-set.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/ufo/ufo-set.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** ufo-set.xml	24 Mar 2006 15:33:06 -0000	1.24
--- ufo-set.xml	31 Mar 2006 17:12:32 -0000	1.25
***************
*** 128,132 ****
  
   <!-- default model -->
!  <model>Aircraft/ufo/Models/cursor.ac</model>
  
   <!-- subdirs of $FG_ROOT to search models in.
--- 128,132 ----
  
   <!-- default model -->
!  <cursor>Aircraft/ufo/Models/cursor.ac</cursor>
  
   <!-- subdirs of $FG_ROOT to search models in.

Index: ufo.nas
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/ufo/ufo.nas,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** ufo.nas	27 Mar 2006 13:23:44 -0000	1.16
--- ufo.nas	31 Mar 2006 17:12:32 -0000	1.17
***************
*** 120,124 ****
  
  
! # scan all objects in subdir of $FG_ROOT. (Prefer *.xml files to *.ac files.)
  #
  scan_models = func(base) {
--- 120,125 ----
  
  
! # scan all objects in subdir of $FG_ROOT. (Prefer *.xml files to *.ac files
! # if both exist)
  #
  scan_models = func(base) {
***************
*** 801,805 ****
  	modellist = scanDirs(getprop("/source"));
  	adjust = Adjust.new("/data");
! 	modelmgr = ModelMgr.new(getprop("/model"));
  	setlistener("/sim/signals/click", func { modelmgr.click() });
  	#setlistener("/sim/signals/click", printDistance);
--- 802,806 ----
  	modellist = scanDirs(getprop("/source"));
  	adjust = Adjust.new("/data");
! 	modelmgr = ModelMgr.new(getprop("/cursor"));
  	setlistener("/sim/signals/click", func { modelmgr.click() });
  	#setlistener("/sim/signals/click", printDistance);
***************
*** 853,857 ****
  	w.set("halign", "fill");
  	w.set("pref-height", 300);
! 	w.set("property", "/model");
  	forindex (var i; modellist) {
  		w.prop().getChild("value", i, 1).setValue(modellist[i]);
--- 854,858 ----
  	w.set("halign", "fill");
  	w.set("pref-height", 300);
! 	w.set("property", "/cursor");
  	forindex (var i; modellist) {
  		w.prop().getChild("value", i, 1).setValue(modellist[i]);