diff options
author | Justin Clark-Casey (justincc) | 2014-09-27 01:02:27 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-10-02 22:30:44 +0100 |
commit | 57e75d7c03b465e295591c0817b911042b74c290 (patch) | |
tree | 111e51802bbe8313b46fba0991ca76d356778920 /OpenSim | |
parent | Set appearance refresh to false by default. (diff) | |
download | opensim-SC-57e75d7c03b465e295591c0817b911042b74c290.zip opensim-SC-57e75d7c03b465e295591c0817b911042b74c290.tar.gz opensim-SC-57e75d7c03b465e295591c0817b911042b74c290.tar.bz2 opensim-SC-57e75d7c03b465e295591c0817b911042b74c290.tar.xz |
Do not add attachments to the region scene object backup list.
Attachment persistence is not handled in this way and this just results in a load of busy work until a check in each SOG terminates a backup check for attachments anyway.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 8528c65..f537124 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -912,7 +912,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
912 | // one full update during the attachment | 912 | // one full update during the attachment |
913 | // process causes some clients to fail to display the | 913 | // process causes some clients to fail to display the |
914 | // attachment properly. | 914 | // attachment properly. |
915 | m_Scene.AddNewSceneObject(group, true, false); | 915 | m_Scene.AddNewSceneObject(group, !attachment, false); |
916 | 916 | ||
917 | // if attachment we set it's asset id so object updates | 917 | // if attachment we set it's asset id so object updates |
918 | // can reflect that, if not, we set it's position in world. | 918 | // can reflect that, if not, we set it's position in world. |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 2aeccd8..205631f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -943,8 +943,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
943 | { | 943 | { |
944 | if (CanBeBackedUp) | 944 | if (CanBeBackedUp) |
945 | { | 945 | { |
946 | //m_log.DebugFormat( | 946 | // m_log.DebugFormat( |
947 | // "[SCENE OBJECT GROUP]: Attaching object {0} {1} to scene presistence sweep", Name, UUID); | 947 | // "[SCENE OBJECT GROUP]: Attaching object {0} {1} to scene presistence sweep", Name, UUID); |
948 | 948 | ||
949 | if (!Backup) | 949 | if (!Backup) |
950 | m_scene.EventManager.OnBackup += ProcessBackup; | 950 | m_scene.EventManager.OnBackup += ProcessBackup; |