aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorMelanie2012-08-07 20:48:57 +0100
committerMelanie2012-08-07 20:48:57 +0100
commitd85c49c98b64e5f1647b48dccd518af7219496f7 (patch)
tree35677c5fbe535954d5ba9672f950848aebc1f424 /OpenSim/Region/ScriptEngine
parentMerge branch 'master' into careminster (diff)
parentRelease http-in URLs when llResetScript is called (diff)
downloadopensim-SC-d85c49c98b64e5f1647b48dccd518af7219496f7.zip
opensim-SC-d85c49c98b64e5f1647b48dccd518af7219496f7.tar.gz
opensim-SC-d85c49c98b64e5f1647b48dccd518af7219496f7.tar.bz2
opensim-SC-d85c49c98b64e5f1647b48dccd518af7219496f7.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
1 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 ce1c364..7237d1d 100644
--- 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
226 public void llResetScript() 226 public void llResetScript()
227 { 227 {
228 m_host.AddScriptLPS(1); 228 m_host.AddScriptLPS(1);
229
230 // We need to tell the URL module, if we hav one, to release
231 // the allocated URLs
232 if (m_UrlModule != null)
233 m_UrlModule.ScriptRemoved(m_item.ItemID);
234
229 m_ScriptEngine.ApiResetScript(m_item.ItemID); 235 m_ScriptEngine.ApiResetScript(m_item.ItemID);
230 } 236 }
231 237