ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2011-10-25 02:14:39 +01:00
parent 585f1b189f ddf54b5537
commit 353f0c0e03
6 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -362,9 +362,6 @@ namespace OpenSim
{
m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
m_configSettings.StorageDll = startupConfig.GetString("storage_plugin");
m_configSettings.ClientstackDll

2
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -743,7 +743,7 @@ namespace OpenSim
return new Scene(
regionInfo, circuitManager, sceneGridService,
simDataService, estateDataService, m_moduleLoader, false,
m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
m_config.Source, m_version);
}
protected void ShutdownClientServer(RegionInfo whichRegion)

5
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -557,7 +557,7 @@ namespace OpenSim.Region.Framework.Scenes
SceneCommunicationService sceneGridService,
ISimulationDataService simDataService, IEstateDataService estateDataService,
ModuleLoader moduleLoader, bool dumpAssetsToFile,
bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
IConfigSource config, string simulatorVersion)
: this(regInfo)
{
m_config = config;
@@ -577,8 +577,6 @@ namespace OpenSim.Region.Framework.Scenes
m_lastIncoming = 0;
m_lastOutgoing = 0;
m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
m_asyncSceneObjectDeleter.Enabled = true;
@@ -727,6 +725,7 @@ namespace OpenSim.Region.Framework.Scenes
m_clampPrimSize = true;
}
m_seeIntoRegionFromNeighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);
m_trustBinaries = startupConfig.GetBoolean("TrustBinaries", m_trustBinaries);
m_allowScriptCrossings = startupConfig.GetBoolean("AllowScriptCrossing", m_allowScriptCrossings);
m_dontPersistBefore =