aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest
diff options
context:
space:
mode:
authorubit2012-07-17 02:07:21 +0200
committerubit2012-07-17 02:07:21 +0200
commite925b0654d12c534ff9f837355ad43483dbd22cb (patch)
treee8a05e918e55ec8034dd724c38f143aac31493b2 /OpenSim/ApplicationPlugins/Rest
parentMerge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff)
parentMerge branch 'avination' into ubitwork (diff)
downloadopensim-SC_OLD-e925b0654d12c534ff9f837355ad43483dbd22cb.zip
opensim-SC_OLD-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.gz
opensim-SC_OLD-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.bz2
opensim-SC_OLD-e925b0654d12c534ff9f837355ad43483dbd22cb.tar.xz
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs1
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)