aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-10-12 21:51:34 +0100
committerJustin Clark-Casey (justincc)2011-10-12 21:51:34 +0100
commit631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1 (patch)
tree10832702313c1f618d3385fd16153ef3c5c0de05 /OpenSim/Region
parentBring LindenUDP.Tests back from the dead. No tests are running. (diff)
downloadopensim-SC-631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1.zip
opensim-SC-631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1.tar.gz
opensim-SC-631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1.tar.bz2
opensim-SC-631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1.tar.xz
Get rid of some traces of the old pre-ROBUST grid architecture config
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
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 0820d01..53c9297 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9842,8 +9842,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9842 IConfigSource config = m_ScriptEngine.ConfigSource; 9842 IConfigSource config = m_ScriptEngine.ConfigSource;
9843 if (config.Configs["Network"] != null) 9843 if (config.Configs["Network"] != null)
9844 { 9844 {
9845 shard = config.Configs["Network"].GetString(
9846 "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
9847 shard = config.Configs["Network"].GetString("shard", shard); 9845 shard = config.Configs["Network"].GetString("shard", shard);
9848 } 9846 }
9849 9847