Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
index a4dd36c..e7d2f86 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
@@ -74,11 +74,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 {
                     m_simianURL = m_config.GetString("SimianServiceURL");
                     if (String.IsNullOrEmpty(m_simianURL))
-                        m_log.ErrorFormat("[SimianGrid] service URL is not defined");
+                    {
+                        // m_log.DebugFormat("[SimianGrid] service URL is not defined");
+                        m_enabled = false;
+                        return;
+                    }
                     
                     InitialiseSimCap();
                     SimulatorCapability = SimulatorCapability.Trim();
-                    m_log.WarnFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
+                    m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
                 }
             }
             catch (Exception e)