aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs2
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs7
3 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 1f782f5..6752e31 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -201,12 +201,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
201 uint regionX = Util.WorldToRegionLoc((uint)x); 201 uint regionX = Util.WorldToRegionLoc((uint)x);
202 uint regionY = Util.WorldToRegionLoc((uint)y); 202 uint regionY = Util.WorldToRegionLoc((uint)y);
203 203
204 /* we are insane now
204 // Sanity check 205 // Sanity check
205 if ((Util.RegionToWorldLoc(regionX) != (uint)x) || (Util.RegionToWorldLoc(regionY) != (uint)y)) 206 if ((Util.RegionToWorldLoc(regionX) != (uint)x) || (Util.RegionToWorldLoc(regionY) != (uint)y))
206 { 207 {
207 m_log.WarnFormat("{0} GetRegionByPosition. Bad position requested: not the base of the region. Requested Pos=<{1},{2}>, Should Be=<{3},{4}>", 208 m_log.WarnFormat("{0} GetRegionByPosition. Bad position requested: not the base of the region. Requested Pos=<{1},{2}>, Should Be=<{3},{4}>",
208 LogHeader, x, y, Util.RegionToWorldLoc(regionX), Util.RegionToWorldLoc(regionY)); 209 LogHeader, x, y, Util.RegionToWorldLoc(regionX), Util.RegionToWorldLoc(regionY));
209 } 210 }
211 */
210 212
211 // First see if it's a neighbour, even if it isn't on this sim. 213 // First see if it's a neighbour, even if it isn't on this sim.
212 // Neighbour data is cached in memory, so this is fast 214 // Neighbour data is cached in memory, so this is fast
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