diff options
author | Justin Clarke Casey | 2009-02-03 20:13:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-03 20:13:34 +0000 |
commit | 2009d1aa01ca615dbcd4b69d3cab179741d9ee1f (patch) | |
tree | f5bf449fa6194041fd2a07dbd0de243822e33fb1 /OpenSim/Region/ScriptEngine | |
parent | * Lock the parts for the old group while we're clearing it as well - not much... (diff) | |
download | opensim-SC-2009d1aa01ca615dbcd4b69d3cab179741d9ee1f.zip opensim-SC-2009d1aa01ca615dbcd4b69d3cab179741d9ee1f.tar.gz opensim-SC-2009d1aa01ca615dbcd4b69d3cab179741d9ee1f.tar.bz2 opensim-SC-2009d1aa01ca615dbcd4b69d3cab179741d9ee1f.tar.xz |
* Fission SceneObjectTests into basic and linking sets
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8fb94b0..7564c69 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -3172,6 +3172,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3172 | childPrim = null; | 3172 | childPrim = null; |
3173 | break; | 3173 | break; |
3174 | } | 3174 | } |
3175 | |||
3175 | if (linknum == ScriptBaseClass.LINK_ROOT) | 3176 | if (linknum == ScriptBaseClass.LINK_ROOT) |
3176 | { | 3177 | { |
3177 | // Restructuring Multiple Prims. | 3178 | // Restructuring Multiple Prims. |
@@ -3182,7 +3183,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3182 | parentPrim.DelinkFromGroup(part.LocalId, true); | 3183 | parentPrim.DelinkFromGroup(part.LocalId, true); |
3183 | } | 3184 | } |
3184 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); | 3185 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); |
3185 | if (parts.Count > 0) { | 3186 | |
3187 | if (parts.Count > 0) | ||
3188 | { | ||
3186 | SceneObjectPart newRoot = parts[0]; | 3189 | SceneObjectPart newRoot = parts[0]; |
3187 | parts.Remove(newRoot); | 3190 | parts.Remove(newRoot); |
3188 | foreach (SceneObjectPart part in parts) | 3191 | foreach (SceneObjectPart part in parts) |
@@ -3196,6 +3199,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3196 | { | 3199 | { |
3197 | if (childPrim == null) | 3200 | if (childPrim == null) |
3198 | return; | 3201 | return; |
3202 | |||
3199 | parentPrim.DelinkFromGroup(childPrim.LocalId, true); | 3203 | parentPrim.DelinkFromGroup(childPrim.LocalId, true); |
3200 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); | 3204 | parentPrim.TriggerScriptChangedEvent(Changed.LINK); |
3201 | } | 3205 | } |