diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs index f4cf6b4..199dd11 100644 --- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | |||
@@ -147,6 +147,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
147 | public void Close() | 147 | public void Close() |
148 | { | 148 | { |
149 | } | 149 | } |
150 | |||
150 | public UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID) | 151 | public UUID RequestURL(IScriptModule engine, SceneObjectPart host, UUID itemID) |
151 | { | 152 | { |
152 | UUID urlcode = UUID.Random(); | 153 | UUID urlcode = UUID.Random(); |
@@ -176,6 +177,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
176 | uri, | 177 | uri, |
177 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 178 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); |
178 | 179 | ||
180 | m_log.DebugFormat( | ||
181 | "[URL MODULE]: Set up incoming request url {0} for {1} in {2} {3}", | ||
182 | uri, itemID, host.Name, host.LocalId); | ||
183 | |||
179 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); | 184 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); |
180 | } | 185 | } |
181 | 186 | ||
@@ -218,6 +223,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
218 | uri, | 223 | uri, |
219 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); | 224 | new PollServiceEventArgs(HttpRequestHandler, HasEvents, GetEvents, NoEvents, urlcode)); |
220 | 225 | ||
226 | m_log.DebugFormat( | ||
227 | "[URL MODULE]: Set up incoming secure request url {0} for {1} in {2} {3}", | ||
228 | uri, itemID, host.Name, host.LocalId); | ||
229 | |||
221 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); | 230 | engine.PostScriptEvent(itemID, "http_request", new Object[] { urlcode.ToString(), "URL_REQUEST_GRANTED", url }); |
222 | } | 231 | } |
223 | 232 | ||
@@ -241,6 +250,10 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp | |||
241 | m_RequestMap.Remove(req); | 250 | m_RequestMap.Remove(req); |
242 | } | 251 | } |
243 | 252 | ||
253 | // m_log.DebugFormat( | ||
254 | // "[URL MODULE]: Releasing url {0} for {1} in {2}", | ||
255 | // url, data.itemID, data.hostID); | ||
256 | |||
244 | RemoveUrl(data); | 257 | RemoveUrl(data); |
245 | m_UrlMap.Remove(url); | 258 | m_UrlMap.Remove(url); |
246 | } | 259 | } |