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/Rest/Inventory/RestHandler.cs | |
| 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-f4cc19968cdbb72fd43cc950f6c8ef160f896438.zip opensim-SC-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.gz opensim-SC-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.bz2 opensim-SC-f4cc19968cdbb72fd43cc950f6c8ef160f896438.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 30 |
1 files changed, 17 insertions, 13 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 | { |