Merge branch 'master' into bulletsim

author: Mic Bowman 2011-08-05 11:13:02 -0700
committer: Mic Bowman 2011-08-05 11:13:02 -0700
commit: c3f579046c4de7a5a65e71e4c02958425fd7998a (patch)
tree: b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
parent: BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff)
parent: remove the largely unused copy/pasted HandleAgentRequestSit() method (diff)
download: opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip
opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz
opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2
opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 0188eb7..3cda984 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -488,11 +488,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                                    rdata.userAppearance.AvatarHeight = (float) Convert.ToDouble(xml.Value);
                                    indata = true;
                                }
-                                if (xml.MoveToAttribute("Owner"))
+//                                if (xml.MoveToAttribute("Owner"))
-                                {
+//                                {
-                                    rdata.userAppearance.Owner = (UUID)xml.Value;
+//                                    rdata.userAppearance.Owner = (UUID)xml.Value;
-                                    indata = true;
+//                                    indata = true;
-                                }
+//                                }
                                if (xml.MoveToAttribute("Serial"))
                                {
                                    rdata.userAppearance.Serial = Convert.ToInt32(xml.Value);
@@ -747,8 +747,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                rdata.writer.WriteStartElement("Appearance");
                rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString());
-                if (rdata.userAppearance.Owner != UUID.Zero)
+//                if (rdata.userAppearance.Owner != UUID.Zero)
-                    rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
+//                    rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
                rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());
 /*
author	Mic Bowman	2011-08-05 11:13:02 -0700
committer	Mic Bowman	2011-08-05 11:13:02 -0700
commit	c3f579046c4de7a5a65e71e4c02958425fd7998a (patch)
tree	b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
parent	BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff)
parent	remove the largely unused copy/pasted HandleAgentRequestSit() method (diff)
download	opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC_OLD-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz

diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index 0188eb7..3cda984 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -488,11 +488,11 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
488	rdata.userAppearance.AvatarHeight = (float) Convert.ToDouble(xml.Value);	488	rdata.userAppearance.AvatarHeight = (float) Convert.ToDouble(xml.Value);
489	indata = true;	489	indata = true;
490	}	490	}
491	if (xml.MoveToAttribute("Owner"))	491	// if (xml.MoveToAttribute("Owner"))
492	{	492	// {
493	rdata.userAppearance.Owner = (UUID)xml.Value;	493	// rdata.userAppearance.Owner = (UUID)xml.Value;
494	indata = true;	494	// indata = true;
495	}	495	// }
496	if (xml.MoveToAttribute("Serial"))	496	if (xml.MoveToAttribute("Serial"))
497	{	497	{
498	rdata.userAppearance.Serial = Convert.ToInt32(xml.Value);	498	rdata.userAppearance.Serial = Convert.ToInt32(xml.Value);
@@ -747,8 +747,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
747	rdata.writer.WriteStartElement("Appearance");	747	rdata.writer.WriteStartElement("Appearance");
748		748
749	rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString());	749	rdata.writer.WriteAttributeString("Height", rdata.userAppearance.AvatarHeight.ToString());
750	if (rdata.userAppearance.Owner != UUID.Zero)	750	// if (rdata.userAppearance.Owner != UUID.Zero)
751	rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());	751	// rdata.writer.WriteAttributeString("Owner", rdata.userAppearance.Owner.ToString());
752	rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());	752	rdata.writer.WriteAttributeString("Serial", rdata.userAppearance.Serial.ToString());
753		753
754	/*	754	/*