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/Regions | |
| 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 'OpenSim/ApplicationPlugins/Rest/Regions')
| -rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs index f790c5e..02ef588 100644 --- a/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs +++ b/OpenSim/ApplicationPlugins/Rest/Regions/RestRegionPlugin.cs | |||
| @@ -68,9 +68,10 @@ namespace OpenSim.ApplicationPlugins.Rest.Regions | |||
| 68 | base.Initialise(openSim); | 68 | base.Initialise(openSim); |
| 69 | if (!IsEnabled) | 69 | if (!IsEnabled) |
| 70 | { | 70 | { |
| 71 | m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID); | 71 | //m_log.WarnFormat("{0} Rest Plugins are disabled", MsgID); |
| 72 | return; | 72 | return; |
| 73 | } | 73 | } |
| 74 | |||
| 74 | m_log.InfoFormat("{0} REST region plugin enabled", MsgID); | 75 | m_log.InfoFormat("{0} REST region plugin enabled", MsgID); |
| 75 | 76 | ||
| 76 | // add REST method handlers | 77 | // add REST method handlers |