Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-02-19 01:59:49 +00:00
18 changed files with 585 additions and 418 deletions

View File

@@ -121,7 +121,7 @@ namespace OpenSim.Services.GridService
m_Check4096 = gridConfig.GetBoolean("Check4096", true);
m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", string.Empty);
m_MapTileDirectory = gridConfig.GetString("MapTileDirectory", "maptiles");
m_GatekeeperConnector = new GatekeeperServiceConnector(m_AssetService);