diff options
| author | Melanie | 2012-06-13 02:15:12 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-13 02:15:12 +0100 |
| commit | 12621201ba5751282f623fa3a7851c546976e47c (patch) | |
| tree | c5a1d99983c959c809966253b107e594a412042d /OpenSim/ApplicationPlugins | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-12621201ba5751282f623fa3a7851c546976e47c.zip opensim-SC_OLD-12621201ba5751282f623fa3a7851c546976e47c.tar.gz opensim-SC_OLD-12621201ba5751282f623fa3a7851c546976e47c.tar.bz2 opensim-SC_OLD-12621201ba5751282f623fa3a7851c546976e47c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index db62d52..cb88695 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | |||
| @@ -539,7 +539,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
| 539 | /// path has not already been registered, the method is added to the active | 539 | /// path has not already been registered, the method is added to the active |
| 540 | /// handler table. | 540 | /// handler table. |
| 541 | /// </summary> | 541 | /// </summary> |
| 542 | |||
| 543 | public void AddStreamHandler(string httpMethod, string path, RestMethod method) | 542 | public void AddStreamHandler(string httpMethod, string path, RestMethod method) |
| 544 | { | 543 | { |
| 545 | if (!IsEnabled) | 544 | if (!IsEnabled) |