Merge branch 'master' into careminster

This commit is contained in:
Melanie
2013-02-06 02:38:30 +00:00
8 changed files with 8 additions and 147 deletions

View File

@@ -798,7 +798,7 @@ namespace OpenSim
return new Scene(
regionInfo, circuitManager, sceneGridService,
simDataService, estateDataService, false,
simDataService, estateDataService,
Config, m_version);
}