diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index f5683f0..f4cf6b4 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -132,6 +132,12 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
132 | 132 | ||
133 | public void RegionLoaded(Scene scene) | 133 | public void RegionLoaded(Scene scene) |
134 | { | 134 | { |
135 | IScriptModule[] scriptModules = scene.RequestModuleInterfaces<IScriptModule>(); | ||
136 | foreach (IScriptModule scriptModule in scriptModules) | ||
137 | { | ||
138 | scriptModule.OnScriptRemoved += ScriptRemoved; | ||
139 | scriptModule.OnObjectRemoved += ObjectRemoved; | ||
140 | } | ||
135 | } | 141 | } |
136 | 142 | ||
137 | public void RemoveRegion(Scene scene) | 143 | public void RemoveRegion(Scene scene) |
@@ -289,6 +295,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
289 | 295 | ||
290 | public void ScriptRemoved(UUID itemID) | 296 | public void ScriptRemoved(UUID itemID) |
291 | { | 297 | { |
298 | // m_log.DebugFormat("[URL MODULE]: Removing script {0}", itemID); | ||
299 | |||
292 | lock (m_UrlMap) | 300 | lock (m_UrlMap) |
293 | { | 301 | { |
294 | List<string> removeURLs = new List<string>(); | 302 | List<string> removeURLs = new List<string>(); |