diff options
| author | Melanie | 2009-09-27 21:25:10 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-27 21:25:10 +0100 |
| commit | b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30 (patch) | |
| tree | b7e6844d7f037541640e489d3c8bec53159b5df0 /OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |
| parent | Add the Migration for the regions table (diff) | |
| parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
| download | opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.zip opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.gz opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.bz2 opensim-SC_OLD-b5bf3f87d552f8aef7fc8f4ab8fa34d6dbefcd30.tar.xz | |
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
Conflicts:
OpenSim/Data/MySQL/MySQLRegionData.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs index fd23384..ff1502a 100644 --- a/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/RestPlugin.cs | |||
| @@ -216,7 +216,7 @@ namespace OpenSim.ApplicationPlugins.Rest | |||
| 216 | 216 | ||
| 217 | if (!_config.GetBoolean("enabled", false)) | 217 | if (!_config.GetBoolean("enabled", false)) |
| 218 | { | 218 | { |
| 219 | m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID); | 219 | //m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID); |
| 220 | return; | 220 | return; |
| 221 | } | 221 | } |
| 222 | 222 | ||