aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorUbitUmarov2015-09-26 01:31:57 +0100
committerUbitUmarov2015-09-26 01:31:57 +0100
commit0fb033e56766b433ccd03347b22e8141c28acaec (patch)
tree39de449d49292d7fe78059c4cef3ce51b84b4bd1 /OpenSim/Region/Framework
parent revert previus wrong commit (diff)
downloadopensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.zip
opensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.tar.gz
opensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.tar.bz2
opensim-SC_OLD-0fb033e56766b433ccd03347b22e8141c28acaec.tar.xz
fix object crossings to other scene on same instance
Diffstat (limited to 'OpenSim/Region/Framework')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 111b74d..3b5f924 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2893,6 +2893,8 @@ namespace OpenSim.Region.Framework.Scenes
2893 // newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject); 2893 // newObject.RootPart.KeyframeMotion.UpdateSceneObject(newObject);
2894 } 2894 }
2895 2895
2896
2897
2896 // Do this as late as possible so that listeners have full access to the incoming object 2898 // Do this as late as possible so that listeners have full access to the incoming object
2897 EventManager.TriggerOnIncomingSceneObject(newObject); 2899 EventManager.TriggerOnIncomingSceneObject(newObject);
2898 2900
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 6029221..22b81dc 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2302,8 +2302,13 @@ namespace OpenSim.Region.Framework.Scenes
2302 dupe.m_isBackedUp = false; 2302 dupe.m_isBackedUp = false;
2303 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>(); 2303 dupe.m_parts = new MapAndArray<OpenMetaverse.UUID, SceneObjectPart>();
2304 2304
2305 dupe.inTransit = inTransit; // this shouldn't be needed TEST 2305 // a copy isnt backedup
2306 dupe.Backup = false;
2307 dupe.m_isBackedUp = false;
2306 2308
2309 // a copy is not in transit hopefully
2310 dupe.inTransit = false;
2311
2307 // new group as no sitting avatars 2312 // new group as no sitting avatars
2308 dupe.m_sittingAvatars = new List<ScenePresence>(); 2313 dupe.m_sittingAvatars = new List<ScenePresence>();
2309 2314