diff options
| author | UbitUmarov | 2012-07-17 00:54:23 +0100 |
|---|---|---|
| committer | UbitUmarov | 2012-07-17 00:54:23 +0100 |
| commit | d5f4fb7b50fb7c594b018f8241399e22f88fc951 (patch) | |
| tree | 8f3dab3d170596f02b1d1d836a0bc08a3e6b8ebd /OpenSim/ApplicationPlugins/Rest | |
| parent | UbitOde: remove useless water collider from active code. (diff) | |
| parent | Merge branch 'avination' into careminster (diff) | |
| download | opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.zip opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.gz opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.bz2 opensim-SC-d5f4fb7b50fb7c594b018f8241399e22f88fc951.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
| -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) |