aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Inventory
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-02 00:13:04 +0100
committerJustin Clark-Casey (justincc)2011-08-02 00:13:04 +0100
commitb6ac1c46cd473b129b70344f0001f1e8f97d8860 (patch)
tree46e5d02205b63d16f29b3aaf6a3ad910192aaeb6 /OpenSim/ApplicationPlugins/Rest/Inventory
parentGet osNpcCreate appearance working with avatars that are currently in the scene. (diff)
downloadopensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.zip
opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.gz
opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.bz2
opensim-SC_OLD-b6ac1c46cd473b129b70344f0001f1e8f97d8860.tar.xz
Get rid of AvatarAppearance.Owner to simplify the code.
This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs14
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
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/*