diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs index b8a4e8e..9d37cdf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | |||
@@ -147,7 +147,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests | |||
147 | // /// <summary> | 147 | // /// <summary> |
148 | // /// Test adding a client to the stack | 148 | // /// Test adding a client to the stack |
149 | // /// </summary> | 149 | // /// </summary> |
150 | // [Test, LongRunning] | 150 | // [Test] |
151 | // public void TestAddClient() | 151 | // public void TestAddClient() |
152 | // { | 152 | // { |
153 | // TestHelper.InMethod(); | 153 | // TestHelper.InMethod(); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index db3d403..eadf69c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -10525,8 +10525,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
10525 | IConfigSource config = m_ScriptEngine.ConfigSource; | 10525 | IConfigSource config = m_ScriptEngine.ConfigSource; |
10526 | if (config.Configs["Network"] != null) | 10526 | if (config.Configs["Network"] != null) |
10527 | { | 10527 | { |
10528 | shard = config.Configs["Network"].GetString( | ||
10529 | "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()); | ||
10530 | shard = config.Configs["Network"].GetString("shard", shard); | 10528 | shard = config.Configs["Network"].GetString("shard", shard); |
10531 | } | 10529 | } |
10532 | 10530 | ||