diff options
author | Melanie Thielker | 2008-10-03 13:45:54 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-03 13:45:54 +0000 |
commit | 36097a8198772d937c82e7bfc6e01a643d7785af (patch) | |
tree | de4a6b516edf12ef24edee02bbd228c1be5d19fd /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | fix the sqlite break. There were two issue here: (diff) | |
download | opensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.zip opensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.tar.gz opensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.tar.bz2 opensim-SC-36097a8198772d937c82e7bfc6e01a643d7785af.tar.xz |
Prevent attachments to be persisted in the destination region when the
avatar is not present there.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 482d936..ebd79e2 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -713,7 +713,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
713 | // don't attach attachments to child agents | 713 | // don't attach attachments to child agents |
714 | if (avatar.IsChildAgent) return; | 714 | if (avatar.IsChildAgent) return; |
715 | 715 | ||
716 | DetachFromBackup(this); | 716 | DetachFromBackup(); |
717 | m_rootPart.AttachedAvatar = agentID; | 717 | m_rootPart.AttachedAvatar = agentID; |
718 | 718 | ||
719 | 719 | ||
@@ -955,7 +955,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
955 | // code needs a redesign. | 955 | // code needs a redesign. |
956 | m_isDeleted = true; | 956 | m_isDeleted = true; |
957 | 957 | ||
958 | DetachFromBackup(this); | 958 | DetachFromBackup(); |
959 | 959 | ||
960 | lock (m_parts) | 960 | lock (m_parts) |
961 | { | 961 | { |
@@ -1925,9 +1925,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1925 | /// Stop this object from being persisted over server restarts. | 1925 | /// Stop this object from being persisted over server restarts. |
1926 | /// </summary> | 1926 | /// </summary> |
1927 | /// <param name="objectGroup"></param> | 1927 | /// <param name="objectGroup"></param> |
1928 | public void DetachFromBackup(SceneObjectGroup objectGroup) | 1928 | public void DetachFromBackup() |
1929 | { | 1929 | { |
1930 | m_scene.EventManager.OnBackup -= objectGroup.ProcessBackup; | 1930 | m_scene.EventManager.OnBackup -= ProcessBackup; |
1931 | } | 1931 | } |
1932 | 1932 | ||
1933 | private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation) | 1933 | private void LinkNonRootPart(SceneObjectPart part, Vector3 oldGroupPosition, Quaternion oldGroupRotation) |