diff options
| author | Melanie | 2011-10-25 01:37:11 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:37:11 +0100 |
| commit | 9ceb98344a8a296994404edaf86b4344e06b9a69 (patch) | |
| tree | 3efe288d54152c6b6b8c24e763495c1eddf62d4e /OpenSim/Region/ScriptEngine | |
| parent | Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge (diff) | |
| parent | Get rid of some traces of the old pre-ROBUST grid architecture config (diff) | |
| download | opensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.zip opensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.gz opensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.bz2 opensim-SC-9ceb98344a8a296994404edaf86b4344e06b9a69.tar.xz | |
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -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 | ||