aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2013-05-26 14:11:48 +0200
committerMelanie2013-05-26 14:11:48 +0200
commita348c8e44a72bd2de0151fc6db7a229cd8ee86a2 (patch)
treec2854be5ea332d45c49ee04a2a2fa2d2d78f149a /OpenSim/Region/ScriptEngine
parentUpdate the money framework to allow sending the new style linden "serverside ... (diff)
downloadopensim-SC_OLD-a348c8e44a72bd2de0151fc6db7a229cd8ee86a2.zip
opensim-SC_OLD-a348c8e44a72bd2de0151fc6db7a229cd8ee86a2.tar.gz
opensim-SC_OLD-a348c8e44a72bd2de0151fc6db7a229cd8ee86a2.tar.bz2
opensim-SC_OLD-a348c8e44a72bd2de0151fc6db7a229cd8ee86a2.tar.xz
Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 884f07c..a47e452 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -398,7 +398,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
398 objtype = 0; 398 objtype = 0;
399 399
400 part = ((SceneObjectGroup)ent).RootPart; 400 part = ((SceneObjectGroup)ent).RootPart;
401 if (part.ParentGroup.AttachmentPoint != 0) // Attached so ignore 401 if (part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.Tree &&
402 part.ParentGroup.RootPart.Shape.PCode != (byte)PCode.NewTree &&
403 part.ParentGroup.AttachmentPoint != 0) // Attached so ignore
402 continue; 404 continue;
403 405
404 if (part.Inventory.ContainsScripts()) 406 if (part.Inventory.ContainsScripts())