aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-04-26 23:18:52 +0200
committerMelanie2011-04-26 23:18:52 +0200
commite713b7e3bbfdae81add08b2ef48ea7f79812f4e0 (patch)
tree0cdca2c20ea4724c03361703082f92e6dd74708e /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-e713b7e3bbfdae81add08b2ef48ea7f79812f4e0.zip
opensim-SC-e713b7e3bbfdae81add08b2ef48ea7f79812f4e0.tar.gz
opensim-SC-e713b7e3bbfdae81add08b2ef48ea7f79812f4e0.tar.bz2
opensim-SC-e713b7e3bbfdae81add08b2ef48ea7f79812f4e0.tar.xz
Try to repair attachments ion the fly if they are detached and reattached.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 3a5b05d..9e48447 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4038,6 +4038,10 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
4038 { 4038 {
4039 lock (m_attachments) 4039 lock (m_attachments)
4040 { 4040 {
4041 // This may be true when the attachment comes back
4042 // from serialization after login. Clear it.
4043 gobj.IsDeleted = false;
4044
4041 m_attachments.Add(gobj); 4045 m_attachments.Add(gobj);
4042 } 4046 }
4043 } 4047 }