diff options
| author | Diva Canto | 2011-02-16 09:57:43 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-02-16 09:57:43 -0800 |
| commit | dd4a503a2205d9aed57216de6615f349491a4c22 (patch) | |
| tree | 3c90e7c217f7fcb30cb43a102ee4551bd27bf1c4 /OpenSim/Services | |
| parent | Fix bug introduced by Query Access. The response does not come in a packaged ... (diff) | |
| parent | Changed console command "alert" and added new command "alert-user". (diff) | |
| download | opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.zip opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.tar.gz opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.tar.bz2 opensim-SC_OLD-dd4a503a2205d9aed57216de6615f349491a4c22.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Services')
| -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 9d98c8f..12ea453 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 | ||