From 631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 12 Oct 2011 21:51:34 +0100 Subject: Get rid of some traces of the old pre-ROBUST grid architecture config --- OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs | 2 +- OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'OpenSim/Region') 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 // /// // /// Test adding a client to the stack // /// -// [Test, LongRunning] +// [Test] // public void TestAddClient() // { // 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 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); } -- cgit v1.1