aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorSean Dague2008-11-20 00:13:15 +0000
committerSean Dague2008-11-20 00:13:15 +0000
commite6f92044caa8f66fd0a04019b9edcd30eb389920 (patch)
treeee7c5ca8013feeaf286e2fb33d6a60a567405ab1 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
parentMantis#2658. Thank you kindly, StrawberryFride for a patch that: (diff)
downloadopensim-SC-e6f92044caa8f66fd0a04019b9edcd30eb389920.zip
opensim-SC-e6f92044caa8f66fd0a04019b9edcd30eb389920.tar.gz
opensim-SC-e6f92044caa8f66fd0a04019b9edcd30eb389920.tar.bz2
opensim-SC-e6f92044caa8f66fd0a04019b9edcd30eb389920.tar.xz
From: Christopher Yeoh <cyeoh@au1.ibm.com>
Attached is a patch which fixes mantis bug 2645 where scripts in child prims freeze after being unlinked from the root prim. This got introduced some time after the 0.6 freeze. Have checked test suites pass even after nant clean ;-) http://opensimulator.org/mantis/bug_update_page.php?bug_id=2645 Also removes a redundant ResetIDs call Regards, Chris
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index a626fa3..96ee169 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1223,7 +1223,6 @@ if (m_shape != null) {
1223 if (userExposed) 1223 if (userExposed)
1224 dupe.UUID = UUID.Random(); 1224 dupe.UUID = UUID.Random();
1225 1225
1226 dupe.LocalId = localID;
1227 dupe._ownerID = AgentID; 1226 dupe._ownerID = AgentID;
1228 dupe._groupID = GroupID; 1227 dupe._groupID = GroupID;
1229 dupe.GroupPosition = GroupPosition; 1228 dupe.GroupPosition = GroupPosition;
@@ -1245,6 +1244,8 @@ if (m_shape != null) {
1245 if (userExposed) 1244 if (userExposed)
1246 dupe.ResetIDs(linkNum); 1245 dupe.ResetIDs(linkNum);
1247 1246
1247 // Move afterwards ResetIDs as it clears the localID
1248 dupe.LocalId = localID;
1248 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. 1249 // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated.
1249 dupe._lastOwnerID = ObjectOwner; 1250 dupe._lastOwnerID = ObjectOwner;
1250 1251
@@ -1927,6 +1928,7 @@ if (m_shape != null) {
1927 { 1928 {
1928 UUID = UUID.Random(); 1929 UUID = UUID.Random();
1929 LinkNum = linkNum; 1930 LinkNum = linkNum;
1931 LocalId = 0;
1930 1932
1931 ResetInventoryIDs(); 1933 ResetInventoryIDs();
1932 } 1934 }