Merge branch 'master' into careminster

2012-08-07 20:48:57 +01:00 · 2012-08-07 20:48:57 +01:00 · d85c49c98b
parent 85b4eab005 926c0b90a1
commit d85c49c98b
1 changed files with 6 additions and 0 deletions
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@ -226,6 +226,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
        public void llResetScript()
        {
            m_host.AddScriptLPS(1);
+
+            // We need to tell the URL module, if we hav one, to release
+            // the allocated URLs
+            if (m_UrlModule != null)
+                m_UrlModule.ScriptRemoved(m_item.ItemID);
+
            m_ScriptEngine.ApiResetScript(m_item.ItemID);
        }