diff options
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 0 insertions, 2 deletions
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 | ||