mantis: 8008 unscripted child prim collisions didn't trigger scripted root prim collision events; collision sounds had incorrect aggregateevents call and default sounds where muted. Future optimization needed and Testing

2 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c046a0c..66cb30c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5109,6 +5109,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 m_host.CollisionSoundVolume = (float)impact_volume;
                 m_host.CollisionSound = m_host.invalidCollisionSoundUUID;
                 m_host.CollisionSoundType = -1; // disable all sounds
+                m_host.aggregateScriptEvents();
                 return;
             }
 
@@ -5122,6 +5123,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
                  m_host.CollisionSoundType = -1;
+
+            m_host.aggregateScriptEvents();
         }
 
         public LSL_String llGetAnimation(string id)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 6168fe0..4af4339 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -4266,6 +4266,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     m_host.CollisionSoundType = 0; // full return to default sounds
                 else
                     m_host.CollisionSoundType = 2; // default sounds with volume
+                m_host.aggregateScriptEvents();           
                 return;
             }
             // TODO: Parameter check logic required.
@@ -4278,6 +4279,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
                  m_host.CollisionSoundType = -1;
+
+            m_host.aggregateScriptEvents();           
         }
 
         // still not very usefull, detector is lost on rez, restarts, etc