aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorRobert Adams2014-02-15 17:10:20 -0800
committerRobert Adams2014-02-15 17:10:20 -0800
commit79200ed27031f03fca9e7bfb7e04c93b4759fbe4 (patch)
tree67c79f473d4f92fa9f9a713c06200801f91aa9ef /OpenSim/Region/CoreModules
parentProperly restore position on crossing failure for mega-regions. (diff)
downloadopensim-SC-79200ed27031f03fca9e7bfb7e04c93b4759fbe4.zip
opensim-SC-79200ed27031f03fca9e7bfb7e04c93b4759fbe4.tar.gz
opensim-SC-79200ed27031f03fca9e7bfb7e04c93b4759fbe4.tar.bz2
opensim-SC-79200ed27031f03fca9e7bfb7e04c93b4759fbe4.tar.xz
Fix displacement and location operations on legacy trees and grass in
the 'load oar' and 'scene' commands. Before they were ignored but the code now relies on the SOG.IsAttachment function for attachmentness.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 0c4b79b..2e638d4 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -483,7 +483,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
483 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject); 483 SceneObjectGroup sceneObject = serialiser.DeserializeGroupFromXml2(serialisedSceneObject);
484 484
485 // Happily this does not do much to the object since it hasn't been added to the scene yet 485 // Happily this does not do much to the object since it hasn't been added to the scene yet
486 if (sceneObject.AttachmentPoint == 0) 486 if (!sceneObject.IsAttachment)
487 { 487 {
488 if (m_displacement != Vector3.Zero || m_rotation != 0f) 488 if (m_displacement != Vector3.Zero || m_rotation != 0f)
489 { 489 {