diff options
| author | Melanie | 2011-02-19 01:59:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-02-19 01:59:49 +0000 |
| commit | 4834b476798cce715d0b5b286a6f20bc577bdabd (patch) | |
| tree | 5bf15fa7978daaff116147838f84e4915bca1777 /OpenSim/Services/GridService/HypergridLinker.cs | |
| parent | Add needed dummy to sample money (diff) | |
| parent | Remove test T020_TestMakeRootAgent() which hasn't been active for ages anyway (diff) | |
| download | opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.zip opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.gz opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.bz2 opensim-SC_OLD-4834b476798cce715d0b5b286a6f20bc577bdabd.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/GridService/HypergridLinker.cs')
| -rw-r--r-- | OpenSim/Services/GridService/HypergridLinker.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs index e0d8103..a4aa44d 100644 --- a/OpenSim/Services/GridService/HypergridLinker.cs +++ b/OpenSim/Services/GridService/HypergridLinker.cs | |||
| @@ -121,7 +121,7 @@ namespace OpenSim.Services.GridService | |||
| 121 | 121 | ||
| 122 | m_Check4096 = gridConfig.GetBoolean("Check4096", true); | 122 | m_Check4096 = gridConfig.GetBoolean("Check4096", true); |
| 123 | 123 | ||
| 124 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", string.Empty); | 124 | m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles"); |
| 125 | 125 | ||
| 126 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); | 126 | m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService); |
| 127 | 127 | ||