diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 4 |
3 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 741c47e..221af44 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -966,7 +966,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
966 | /// <returns></returns> | 966 | /// <returns></returns> |
967 | public void Backup() | 967 | public void Backup() |
968 | { | 968 | { |
969 | lock(m_returns) | 969 | lock (m_returns) |
970 | { | 970 | { |
971 | EventManager.TriggerOnBackup(m_storageManager.DataStore); | 971 | EventManager.TriggerOnBackup(m_storageManager.DataStore); |
972 | m_backingup = false; | 972 | m_backingup = false; |
@@ -1003,7 +1003,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1003 | 1003 | ||
1004 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) | 1004 | public void AddReturn(UUID agentID, string objectName, Vector3 location, string reason) |
1005 | { | 1005 | { |
1006 | lock(m_returns) | 1006 | lock (m_returns) |
1007 | { | 1007 | { |
1008 | if (m_returns.ContainsKey(agentID)) | 1008 | if (m_returns.ContainsKey(agentID)) |
1009 | { | 1009 | { |
@@ -2428,7 +2428,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2428 | if (regionInfo == null) | 2428 | if (regionInfo == null) |
2429 | { | 2429 | { |
2430 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); | 2430 | regionInfo = CommsManager.GridService.RequestNeighbourInfo(UserProfile.HomeRegion); |
2431 | if(regionInfo != null) // home region can be away temporarily, too | 2431 | if (regionInfo != null) // home region can be away temporarily, too |
2432 | { | 2432 | { |
2433 | UserProfile.HomeRegionID = regionInfo.RegionID; | 2433 | UserProfile.HomeRegionID = regionInfo.RegionID; |
2434 | CommsManager.UserService.UpdateUserProfile(UserProfile); | 2434 | CommsManager.UserService.UpdateUserProfile(UserProfile); |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index e8eaef8..f9eaa89 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -593,9 +593,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
593 | RegionHandle = m_scene.RegionInfo.RegionHandle; | 593 | RegionHandle = m_scene.RegionInfo.RegionHandle; |
594 | 594 | ||
595 | m_rootPart.ParentID = 0; | 595 | m_rootPart.ParentID = 0; |
596 | if (m_rootPart.LocalId==0) | 596 | if (m_rootPart.LocalId==0) |
597 | m_rootPart.LocalId = m_scene.AllocateLocalId(); | 597 | m_rootPart.LocalId = m_scene.AllocateLocalId(); |
598 | |||
599 | 598 | ||
600 | // No need to lock here since the object isn't yet in a scene | 599 | // No need to lock here since the object isn't yet in a scene |
601 | foreach (SceneObjectPart part in m_parts.Values) | 600 | foreach (SceneObjectPart part in m_parts.Values) |
@@ -603,7 +602,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
603 | if (Object.ReferenceEquals(part, m_rootPart)) | 602 | if (Object.ReferenceEquals(part, m_rootPart)) |
604 | continue; | 603 | continue; |
605 | if (part.LocalId==0) | 604 | if (part.LocalId==0) |
606 | part.LocalId = m_scene.AllocateLocalId(); | 605 | part.LocalId = m_scene.AllocateLocalId(); |
607 | part.ParentID = m_rootPart.LocalId; | 606 | part.ParentID = m_rootPart.LocalId; |
608 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); | 607 | //m_log.DebugFormat("[SCENE]: Given local id {0} to part {1}, linknum {2}, parent {3} {4}", part.LocalId, part.UUID, part.LinkNum, part.ParentID, part.ParentUUID); |
609 | } | 608 | } |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 2c501e4..888643e 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1244,7 +1244,7 @@ if (m_shape != null) { | |||
1244 | if (userExposed) | 1244 | if (userExposed) |
1245 | dupe.ResetIDs(linkNum); | 1245 | dupe.ResetIDs(linkNum); |
1246 | 1246 | ||
1247 | // Move afterwards ResetIDs as it clears the localID | 1247 | // Move afterwards ResetIDs as it clears the localID |
1248 | dupe.LocalId = localID; | 1248 | dupe.LocalId = localID; |
1249 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. | 1249 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. |
1250 | dupe._lastOwnerID = ObjectOwner; | 1250 | dupe._lastOwnerID = ObjectOwner; |
@@ -1928,7 +1928,7 @@ if (m_shape != null) { | |||
1928 | { | 1928 | { |
1929 | UUID = UUID.Random(); | 1929 | UUID = UUID.Random(); |
1930 | LinkNum = linkNum; | 1930 | LinkNum = linkNum; |
1931 | LocalId = 0; | 1931 | LocalId = 0; |
1932 | 1932 | ||
1933 | ResetInventoryIDs(); | 1933 | ResetInventoryIDs(); |
1934 | } | 1934 | } |