diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index cd4be99..2ad01f9 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -271,11 +271,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
271 | get { return m_rootPart.Text; } | 271 | get { return m_rootPart.Text; } |
272 | set { m_rootPart.Text = value; } | 272 | set { m_rootPart.Text = value; } |
273 | } | 273 | } |
274 | 274 | ||
275 | protected virtual bool InSceneBackup | 275 | protected virtual bool InSceneBackup |
276 | { | 276 | { |
277 | get { return true; } | 277 | get { return true; } |
278 | } | 278 | } |
279 | 279 | ||
280 | public bool IsSelected | 280 | public bool IsSelected |
281 | { | 281 | { |
@@ -523,11 +523,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
523 | { | 523 | { |
524 | // m_log.DebugFormat( | 524 | // m_log.DebugFormat( |
525 | // "[SCENE OBJECT GROUP]: Attaching object {0} to scene presistence sweep", UUID); | 525 | // "[SCENE OBJECT GROUP]: Attaching object {0} to scene presistence sweep", UUID); |
526 | 526 | ||
527 | m_scene.EventManager.OnBackup += ProcessBackup; | 527 | m_scene.EventManager.OnBackup += ProcessBackup; |
528 | } | 528 | } |
529 | } | 529 | } |
530 | 530 | ||
531 | public LLVector3 GroupScale() | 531 | public LLVector3 GroupScale() |
532 | { | 532 | { |
533 | LLVector3 minScale = new LLVector3(Constants.RegionSize,Constants.RegionSize,Constants.RegionSize); | 533 | LLVector3 minScale = new LLVector3(Constants.RegionSize,Constants.RegionSize,Constants.RegionSize); |
@@ -1079,21 +1079,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
1079 | /// </summary> | 1079 | /// </summary> |
1080 | /// <param name="datastore"></param> | 1080 | /// <param name="datastore"></param> |
1081 | public void ProcessBackup(IRegionDataStore datastore) | 1081 | public void ProcessBackup(IRegionDataStore datastore) |
1082 | { | 1082 | { |
1083 | // don't backup while it's selected or you're asking for changes mid stream. | 1083 | // don't backup while it's selected or you're asking for changes mid stream. |
1084 | if (HasGroupChanged) | 1084 | if (HasGroupChanged) |
1085 | { | 1085 | { |
1086 | if ((!IsSelected) && (RootPart != null)) | 1086 | if ((!IsSelected) && (RootPart != null)) |
1087 | { | 1087 | { |
1088 | m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID); | 1088 | m_log.InfoFormat("[SCENE OBJECT GROUP]: Storing object {0}", UUID); |
1089 | 1089 | ||
1090 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); | 1090 | SceneObjectGroup backup_group = Copy(OwnerID, GroupID, false); |
1091 | 1091 | ||
1092 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); | 1092 | datastore.StoreObject(backup_group, m_scene.RegionInfo.RegionID); |
1093 | HasGroupChanged = false; | 1093 | HasGroupChanged = false; |
1094 | 1094 | ||
1095 | backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); | 1095 | backup_group.ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); |
1096 | 1096 | ||
1097 | backup_group = null; | 1097 | backup_group = null; |
1098 | } | 1098 | } |
1099 | // else | 1099 | // else |
@@ -1102,10 +1102,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1102 | // "[SCENE OBJECT GROUP]: Did not update persistence of object {0} since it was still selected by an avatar during the backup sweep", UUID); | 1102 | // "[SCENE OBJECT GROUP]: Did not update persistence of object {0} since it was still selected by an avatar during the backup sweep", UUID); |
1103 | // } | 1103 | // } |
1104 | } | 1104 | } |
1105 | 1105 | ||
1106 | // Why is storing the inventory outside of HasGroupChanged? | 1106 | // Why is storing the inventory outside of HasGroupChanged? |
1107 | 1107 | ||
1108 | 1108 | ||
1109 | //ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); | 1109 | //ForEachPart(delegate(SceneObjectPart part) { part.ProcessInventoryBackup(datastore); }); |
1110 | } | 1110 | } |
1111 | 1111 | ||
@@ -1192,7 +1192,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1192 | dupe.m_regionHandle = m_regionHandle; | 1192 | dupe.m_regionHandle = m_regionHandle; |
1193 | 1193 | ||
1194 | dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); | 1194 | dupe.CopyRootPart(m_rootPart, OwnerID, GroupID, userExposed); |
1195 | 1195 | ||
1196 | if (userExposed) | 1196 | if (userExposed) |
1197 | dupe.m_rootPart.TrimPermissions(); | 1197 | dupe.m_rootPart.TrimPermissions(); |
1198 | 1198 | ||
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1223 | { | 1223 | { |
1224 | SetRootPartOwner(m_rootPart, cAgentID, cGroupID); | 1224 | SetRootPartOwner(m_rootPart, cAgentID, cGroupID); |
1225 | m_rootPart.ScheduleFullUpdate(); | 1225 | m_rootPart.ScheduleFullUpdate(); |
1226 | } | 1226 | } |
1227 | 1227 | ||
1228 | List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.Values); | 1228 | List<SceneObjectPart> partList = new List<SceneObjectPart>(m_parts.Values); |
1229 | foreach (SceneObjectPart part in partList) | 1229 | foreach (SceneObjectPart part in partList) |
@@ -1231,7 +1231,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1231 | if (part.UUID != m_rootPart.UUID) | 1231 | if (part.UUID != m_rootPart.UUID) |
1232 | { | 1232 | { |
1233 | dupe.CopyPart(part, OwnerID, GroupID, userExposed); | 1233 | dupe.CopyPart(part, OwnerID, GroupID, userExposed); |
1234 | 1234 | ||
1235 | if (userExposed) | 1235 | if (userExposed) |
1236 | { | 1236 | { |
1237 | SetPartOwner(part, cAgentID, cGroupID); | 1237 | SetPartOwner(part, cAgentID, cGroupID); |