diff options
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 21e133b..c86e4a1 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -37,6 +37,7 @@ using OpenMetaverse.Packets; | |||
37 | using OpenSim.Framework; | 37 | using OpenSim.Framework; |
38 | using OpenSim.Region.Framework.Interfaces; | 38 | using OpenSim.Region.Framework.Interfaces; |
39 | using OpenSim.Region.Physics.Manager; | 39 | using OpenSim.Region.Physics.Manager; |
40 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.Framework.Scenes | 42 | namespace OpenSim.Region.Framework.Scenes |
42 | { | 43 | { |
@@ -3366,6 +3367,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3366 | return sog; | 3367 | return sog; |
3367 | } | 3368 | } |
3368 | 3369 | ||
3370 | public virtual string ToXml2() | ||
3371 | { | ||
3372 | return SceneObjectSerializer.ToXml2Format(this); | ||
3373 | } | ||
3374 | |||
3369 | public virtual string ExtraToXmlString() | 3375 | public virtual string ExtraToXmlString() |
3370 | { | 3376 | { |
3371 | return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; | 3377 | return "<ExtraFromAssetID>" + GetFromAssetID().ToString() + "</ExtraFromAssetID>"; |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index fa1fd89..50baa9b 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1218,9 +1218,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1218 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) | 1218 | if ((flags & (uint) AgentManager.ControlFlags.AGENT_CONTROL_STAND_UP) != 0) |
1219 | { | 1219 | { |
1220 | StandUp(); | 1220 | StandUp(); |
1221 | } | 1221 | } |
1222 | |||
1223 | |||
1224 | 1222 | ||
1225 | // Check if Client has camera in 'follow cam' or 'build' mode. | 1223 | // Check if Client has camera in 'follow cam' or 'build' mode. |
1226 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); | 1224 | Vector3 camdif = (Vector3.One * m_bodyRot - Vector3.One * CameraRotation); |