OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

TeleportWork
Justin Clark-Casey (justincc) 2013-08-05 20:37:27 +01:00
parent 7f0d9ad644 03698121ed
commit 151a8ca0cc
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
View File

@ -79,7 +79,11 @@ 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;
}
}
}
else

8
OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
View File

@ -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)