diff options
author | Tom | 2011-09-04 07:06:36 -0700 |
---|---|---|
committer | Tom | 2011-09-04 07:06:36 -0700 |
commit | 66dec3b8742eff04fbbcc6e3249fe4ba87986500 (patch) | |
tree | 76cc708a821d35fac5cdbbce2de304b47064e732 /OpenSim/ApplicationPlugins | |
parent | Guard another nullref (diff) | |
parent | Fixed BulletSim config files for Linux *.so libraries. (diff) | |
download | opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.zip opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.gz opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.bz2 opensim-SC_OLD-66dec3b8742eff04fbbcc6e3249fe4ba87986500.tar.xz |
Resolve merge commits, stage 1
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | 14 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs | 4 |
2 files changed, 9 insertions, 9 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 | /* |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs index 4333ef1..1023108 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/tests/Remote.cs | |||
@@ -168,8 +168,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory.Tests | |||
168 | float x = Convert.ToSingle(rdata.Parameters[PARM_MOVE_X]); | 168 | float x = Convert.ToSingle(rdata.Parameters[PARM_MOVE_X]); |
169 | float y = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Y]); | 169 | float y = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Y]); |
170 | float z = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Z]); | 170 | float z = Convert.ToSingle(rdata.Parameters[PARM_MOVE_Z]); |
171 | Vector3 vector = new Vector3(x,y,z); | 171 | Vector3 vector = new Vector3(x, y, z); |
172 | presence.DoAutoPilot(0,vector,presence.ControllingClient); | 172 | presence.MoveToTarget(vector, false); |
173 | } | 173 | } |
174 | catch (Exception e) | 174 | catch (Exception e) |
175 | { | 175 | { |