aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-04-26 23:41:57 +0100
committerMelanie2011-04-26 23:41:57 +0100
commit57efed988c41470d6b875ef5cbba87fcc2774274 (patch)
tree1487a968ceb27437f1a96267901cb9286029bedd /OpenSim
parentMerge branch 'queuetest' into careminster-presence-refactor (diff)
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-57efed988c41470d6b875ef5cbba87fcc2774274.zip
opensim-SC_OLD-57efed988c41470d6b875ef5cbba87fcc2774274.tar.gz
opensim-SC_OLD-57efed988c41470d6b875ef5cbba87fcc2774274.tar.bz2
opensim-SC_OLD-57efed988c41470d6b875ef5cbba87fcc2774274.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
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 a6bdc59..e551a2e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4035,6 +4035,10 @@ if (m_animator.m_jumping) force.Z = m_animator.m_jumpVelocity; // add for ju
4035 { 4035 {
4036 lock (m_attachments) 4036 lock (m_attachments)
4037 { 4037 {
4038 // This may be true when the attachment comes back
4039 // from serialization after login. Clear it.
4040 gobj.IsDeleted = false;
4041
4038 m_attachments.Add(gobj); 4042 m_attachments.Add(gobj);
4039 } 4043 }
4040 } 4044 }