diff options
author | BlueWall | 2012-03-04 10:42:37 -0500 |
---|---|---|
committer | BlueWall | 2012-03-04 10:42:37 -0500 |
commit | 33a154e446d63ed1eb192153399a62077e8729fc (patch) | |
tree | b8831c52f18e353e26de83a16058fd276c9cbb10 /OpenSim/Region | |
parent | OpenID auth needs hashing before authenticating (diff) | |
parent | comment out "[CAPS]: ScriptTaskInventory Request" log spam (diff) | |
download | opensim-SC_OLD-33a154e446d63ed1eb192153399a62077e8729fc.zip opensim-SC_OLD-33a154e446d63ed1eb192153399a62077e8729fc.tar.gz opensim-SC_OLD-33a154e446d63ed1eb192153399a62077e8729fc.tar.bz2 opensim-SC_OLD-33a154e446d63ed1eb192153399a62077e8729fc.tar.xz |
Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index be699db..35cb575 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -262,7 +262,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
262 | { | 262 | { |
263 | try | 263 | try |
264 | { | 264 | { |
265 | m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName); | 265 | // m_log.Debug("[CAPS]: ScriptTaskInventory Request in region: " + m_regionName); |
266 | //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); | 266 | //m_log.DebugFormat("[CAPS]: request: {0}, path: {1}, param: {2}", request, path, param); |
267 | 267 | ||
268 | Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); | 268 | Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9bca654..a01b851 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -4156,16 +4156,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
4156 | public bool PipeEventsForScript(uint localID) | 4156 | public bool PipeEventsForScript(uint localID) |
4157 | { | 4157 | { |
4158 | SceneObjectPart part = GetSceneObjectPart(localID); | 4158 | SceneObjectPart part = GetSceneObjectPart(localID); |
4159 | |||
4159 | if (part != null) | 4160 | if (part != null) |
4160 | { | 4161 | { |
4161 | // Changed so that child prims of attachments return ScriptDanger for their parent, so that | ||
4162 | // their scripts will actually run. | ||
4163 | // -- Leaf, Tue Aug 12 14:17:05 EDT 2008 | ||
4164 | SceneObjectPart parent = part.ParentGroup.RootPart; | 4162 | SceneObjectPart parent = part.ParentGroup.RootPart; |
4165 | if (part.ParentGroup.IsAttachment) | 4163 | return ScriptDanger(parent, parent.GetWorldPosition()); |
4166 | return ScriptDanger(parent, parent.GetWorldPosition()); | ||
4167 | else | ||
4168 | return ScriptDanger(part, part.GetWorldPosition()); | ||
4169 | } | 4164 | } |
4170 | else | 4165 | else |
4171 | { | 4166 | { |