From 9b56f993261954fe9918bd0c9205a41e058183a1 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 23 May 2013 23:52:07 +0100
Subject: Fix bug where a cloned object would report the wrong
 llGetNumberOfPrims() when avatars had been sitting on the original and a
 different avatar sat on the copy within the same opensim session.

This was because the sitting avatars list was being cloned rather than reset.
Addresses http://opensimulator.org/mantis/view.php?id=6649
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 38fa26a..2d4218d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1500,6 +1500,7 @@ namespace OpenSim.Region.Framework.Scenes
                 dupe.IsAttachment = true;
 
             dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
+            dupe.m_sittingAvatars = new List<UUID>();
 
             if (!userExposed)
             {
-- 
cgit v1.1


From eb2bd9d203dbc9d202ae62594fcbdb53d38031ac Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 24 May 2013 00:46:58 +0100
Subject: minor: Remove unnecessary duplication of AbsolutePosition Vector3 in
 SOG.Copy()

As a struct, Vector3 has already been cloned by MemberwiseClone()
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2d4218d..df23cc5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1499,7 +1499,6 @@ namespace OpenSim.Region.Framework.Scenes
             if (!userExposed)
                 dupe.IsAttachment = true;
 
-            dupe.AbsolutePosition = new Vector3(AbsolutePosition.X, AbsolutePosition.Y, AbsolutePosition.Z);
             dupe.m_sittingAvatars = new List<UUID>();
 
             if (!userExposed)
-- 
cgit v1.1