diff options
author | Kitto Flora | 2009-09-30 19:07:18 +0200 |
---|---|---|
committer | Kitto Flora | 2009-09-30 19:07:18 +0200 |
commit | 07df0e0ab0c69633a6afec8d05cccc117656d3d9 (patch) | |
tree | 3048cc38b313e255cbf03fa3e2900e28cadc47c9 /OpenSim/ApplicationPlugins/Rest/Inventory | |
parent | And another merge issue (diff) | |
parent | Fix loading modules with alternate configurations and ports into ROBUST. (diff) | |
download | opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.zip opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.gz opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.bz2 opensim-SC_OLD-07df0e0ab0c69633a6afec8d05cccc117656d3d9.tar.xz |
Merge branch '0.6.7-post-fixes' into vehicles
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs index 13f6426..db62d52 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs | |||
@@ -207,7 +207,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
207 | // This plugin will only be enabled if the broader | 207 | // This plugin will only be enabled if the broader |
208 | // REST plugin mechanism is enabled. | 208 | // REST plugin mechanism is enabled. |
209 | 209 | ||
210 | Rest.Log.InfoFormat("{0} Plugin is initializing", MsgId); | 210 | //Rest.Log.InfoFormat("{0} Plugin is initializing", MsgId); |
211 | 211 | ||
212 | base.Initialise(openSim); | 212 | base.Initialise(openSim); |
213 | 213 | ||
@@ -216,7 +216,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
216 | 216 | ||
217 | if (!IsEnabled) | 217 | if (!IsEnabled) |
218 | { | 218 | { |
219 | Rest.Log.WarnFormat("{0} Plugins are disabled", MsgId); | 219 | //Rest.Log.WarnFormat("{0} Plugins are disabled", MsgId); |
220 | return; | 220 | return; |
221 | } | 221 | } |
222 | 222 | ||