diff options
author | Diva Canto | 2012-09-21 07:45:26 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-21 07:45:26 -0700 |
commit | f4cc19968cdbb72fd43cc950f6c8ef160f896438 (patch) | |
tree | 80859de8ea03de99d8951235bc59e017c7012bd4 /OpenSim/ApplicationPlugins | |
parent | HG 2.0: added asset import/export policies at the sim too. (diff) | |
parent | minor: Make slow outgoing request log messages consistent with other log mess... (diff) | |
download | opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.zip opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.gz opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.bz2 opensim-SC_OLD-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 30 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 14 |
2 files changed, 25 insertions, 19 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index cb88695..072bd6f 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | |||
@@ -312,14 +312,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
312 | // Now that everything is setup we can proceed to | 312 | // Now that everything is setup we can proceed to |
313 | // add THIS agent to the HTTP server's handler list | 313 | // add THIS agent to the HTTP server's handler list |
314 | 314 | ||
315 | if (!AddAgentHandler(Rest.Name,this)) | 315 | // FIXME: If this code is ever to be re-enabled (most of it is disabled already) then this will |
316 | { | 316 | // have to be handled through the AddHttpHandler interface. |
317 | Rest.Log.ErrorFormat("{0} Unable to activate handler interface", MsgId); | 317 | // if (!AddAgentHandler(Rest.Name,this)) |
318 | foreach (IRest handler in handlers) | 318 | // { |
319 | { | 319 | // Rest.Log.ErrorFormat("{0} Unable to activate handler interface", MsgId); |
320 | handler.Close(); | 320 | // foreach (IRest handler in handlers) |
321 | } | 321 | // { |
322 | } | 322 | // handler.Close(); |
323 | // } | ||
324 | // } | ||
323 | 325 | ||
324 | } | 326 | } |
325 | catch (Exception e) | 327 | catch (Exception e) |
@@ -342,11 +344,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
342 | { | 344 | { |
343 | Rest.Log.InfoFormat("{0} Plugin is terminating", MsgId); | 345 | Rest.Log.InfoFormat("{0} Plugin is terminating", MsgId); |
344 | 346 | ||
345 | try | 347 | // FIXME: If this code is ever to be re-enabled (most of it is disabled already) then this will |
346 | { | 348 | // have to be handled through the AddHttpHandler interface. |
347 | RemoveAgentHandler(Rest.Name, this); | 349 | // try |
348 | } | 350 | // { |
349 | catch (KeyNotFoundException){} | 351 | // RemoveAgentHandler(Rest.Name, this); |
352 | // } | ||
353 | // catch (KeyNotFoundException){} | ||
350 | 354 | ||
351 | foreach (IRest handler in handlers) | 355 | foreach (IRest handler in handlers) |
352 | { | 356 | { |
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index eb16750..a2425b5 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |||
@@ -297,7 +297,9 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
297 | { | 297 | { |
298 | if (!IsEnabled) return false; | 298 | if (!IsEnabled) return false; |
299 | _agents.Add(agentName, handler); | 299 | _agents.Add(agentName, handler); |
300 | return _httpd.AddAgentHandler(agentName, handler); | 300 | // return _httpd.AddAgentHandler(agentName, handler); |
301 | |||
302 | return false; | ||
301 | } | 303 | } |
302 | 304 | ||
303 | /// <summary> | 305 | /// <summary> |
@@ -316,7 +318,7 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
316 | if (_agents[agentName] == handler) | 318 | if (_agents[agentName] == handler) |
317 | { | 319 | { |
318 | _agents.Remove(agentName); | 320 | _agents.Remove(agentName); |
319 | return _httpd.RemoveAgentHandler(agentName, handler); | 321 | // return _httpd.RemoveAgentHandler(agentName, handler); |
320 | } | 322 | } |
321 | return false; | 323 | return false; |
322 | } | 324 | } |
@@ -358,10 +360,10 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
358 | _httpd.RemoveStreamHandler(h.HttpMethod, h.Path); | 360 | _httpd.RemoveStreamHandler(h.HttpMethod, h.Path); |
359 | } | 361 | } |
360 | _handlers = null; | 362 | _handlers = null; |
361 | foreach (KeyValuePair<string, IHttpAgentHandler> h in _agents) | 363 | // foreach (KeyValuePair<string, IHttpAgentHandler> h in _agents) |
362 | { | 364 | // { |
363 | _httpd.RemoveAgentHandler(h.Key, h.Value); | 365 | // _httpd.RemoveAgentHandler(h.Key, h.Value); |
364 | } | 366 | // } |
365 | _agents = null; | 367 | _agents = null; |
366 | } | 368 | } |
367 | 369 | ||