aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-08-07 21:59:21 +0100
committerUbitUmarov2012-08-07 21:59:21 +0100
commitfef07b807debf5bc0560df936a3e46c59bf72e1c (patch)
tree120cb7aad8f6efa42faa02ef809991d03ae0000c /OpenSim
parent use a bit more complex mesh key identifier, plus a bug fix (diff)
parentMerge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster in... (diff)
downloadopensim-SC-fef07b807debf5bc0560df936a3e46c59bf72e1c.zip
opensim-SC-fef07b807debf5bc0560df936a3e46c59bf72e1c.tar.gz
opensim-SC-fef07b807debf5bc0560df936a3e46c59bf72e1c.tar.bz2
opensim-SC-fef07b807debf5bc0560df936a3e46c59bf72e1c.tar.xz
Merge branch 'avination' into ubitwork
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