Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge

This commit is contained in:
Melanie
2011-10-25 01:37:11 +01:00
5 changed files with 6 additions and 54 deletions

View File

@@ -10525,8 +10525,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
IConfigSource config = m_ScriptEngine.ConfigSource;
if (config.Configs["Network"] != null)
{
shard = config.Configs["Network"].GetString(
"user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
shard = config.Configs["Network"].GetString("shard", shard);
}