diff options
author | Diva Canto | 2013-08-05 14:21:39 -0700 |
---|---|---|
committer | Diva Canto | 2013-08-05 14:21:39 -0700 |
commit | 2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c (patch) | |
tree | ca9a354c5a10d40679101e20ffce27afe6d257ea /OpenSim/Services | |
parent | Child agent updates: remove the dependency on the root agent's camera positio... (diff) | |
parent | Comment out debug log lines about script modules comms for now. (diff) | |
download | opensim-SC_OLD-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.zip opensim-SC_OLD-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.tar.gz opensim-SC_OLD-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.tar.bz2 opensim-SC_OLD-2d3ac2b1ec321d7d6418d548872dcecdbc3cb14c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs index 8226705..e85b0b7 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | |||
@@ -79,7 +79,11 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
79 | { | 79 | { |
80 | m_simianURL = m_config.GetString("SimianServiceURL"); | 80 | m_simianURL = m_config.GetString("SimianServiceURL"); |
81 | if (String.IsNullOrEmpty(m_simianURL)) | 81 | if (String.IsNullOrEmpty(m_simianURL)) |
82 | m_log.ErrorFormat("[SimianGrid] service URL is not defined"); | 82 | { |
83 | //m_log.DebugFormat("[SimianGrid] service URL is not defined"); | ||
84 | m_enabled = false; | ||
85 | return; | ||
86 | } | ||
83 | } | 87 | } |
84 | } | 88 | } |
85 | else | 89 | else |
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 | |||
74 | { | 74 | { |
75 | m_simianURL = m_config.GetString("SimianServiceURL"); | 75 | m_simianURL = m_config.GetString("SimianServiceURL"); |
76 | if (String.IsNullOrEmpty(m_simianURL)) | 76 | if (String.IsNullOrEmpty(m_simianURL)) |
77 | m_log.ErrorFormat("[SimianGrid] service URL is not defined"); | 77 | { |
78 | // m_log.DebugFormat("[SimianGrid] service URL is not defined"); | ||
79 | m_enabled = false; | ||
80 | return; | ||
81 | } | ||
78 | 82 | ||
79 | InitialiseSimCap(); | 83 | InitialiseSimCap(); |
80 | SimulatorCapability = SimulatorCapability.Trim(); | 84 | SimulatorCapability = SimulatorCapability.Trim(); |
81 | m_log.WarnFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability); | 85 | m_log.InfoFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability); |
82 | } | 86 | } |
83 | } | 87 | } |
84 | catch (Exception e) | 88 | catch (Exception e) |