diff options
author | Melanie Thielker | 2008-10-03 15:32:44 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-10-03 15:32:44 +0000 |
commit | 3902149e1b3954ea92e0a2dce1e6a9da3c42b6e8 (patch) | |
tree | 3b797b849b22830d69f83e24500c9b57e4182539 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |
parent | * For shits and giggles, print out the time taken for a server to start up (w... (diff) | |
download | opensim-SC_OLD-3902149e1b3954ea92e0a2dce1e6a9da3c42b6e8.zip opensim-SC_OLD-3902149e1b3954ea92e0a2dce1e6a9da3c42b6e8.tar.gz opensim-SC_OLD-3902149e1b3954ea92e0a2dce1e6a9da3c42b6e8.tar.bz2 opensim-SC_OLD-3902149e1b3954ea92e0a2dce1e6a9da3c42b6e8.tar.xz |
Implement temp-on-rez objecte really being temporary
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index ebd79e2..9a418b8 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | |||
@@ -1809,7 +1809,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1809 | linkPart.LinkNum = m_parts.Count; | 1809 | linkPart.LinkNum = m_parts.Count; |
1810 | 1810 | ||
1811 | linkPart.SetParent(this); | 1811 | linkPart.SetParent(this); |
1812 | linkPart.AddFlag(PrimFlags.CreateSelected); | 1812 | linkPart.AddFlag(PrimFlags.CreateSelected); |
1813 | 1813 | ||
1814 | //if (linkPart.PhysActor != null) | 1814 | //if (linkPart.PhysActor != null) |
1815 | //{ | 1815 | //{ |
@@ -2081,6 +2081,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
2081 | { | 2081 | { |
2082 | SceneObjectPart selectionPart = GetChildPart(localID); | 2082 | SceneObjectPart selectionPart = GetChildPart(localID); |
2083 | 2083 | ||
2084 | if (data[47] != 0) // Temporary | ||
2085 | DetachFromBackup(); | ||
2086 | |||
2084 | if (selectionPart != null) | 2087 | if (selectionPart != null) |
2085 | { | 2088 | { |
2086 | lock (m_parts) | 2089 | lock (m_parts) |
@@ -2089,7 +2092,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2089 | { | 2092 | { |
2090 | if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) | 2093 | if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0) |
2091 | { | 2094 | { |
2092 | data[47] = 0; // Reset physics | 2095 | data[46] = 0; // Reset physics |
2093 | break; | 2096 | break; |
2094 | } | 2097 | } |
2095 | } | 2098 | } |