OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge 

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

5
OpenSim/Framework/ConfigSettings.cs
View File

@ -31,13 +31,8 @@ namespace OpenSim.Framework
{ {
public string PhysicsEngine { get; set; } public string PhysicsEngine { get; set; }
public string MeshEngineName { get; set; } public string MeshEngineName { get; set; }
public bool See_into_region_from_neighbor { get; set; }
public string StorageDll { get; set; } public string StorageDll { get; set; }
public string ClientstackDll { get; set; } public string ClientstackDll { get; set; }
public bool PhysicalPrim { get; set; }
public string LibrariesXMLFile { get; set; } public string LibrariesXMLFile { get; set; }
public const uint DefaultRegionHttpPort = 9000; public const uint DefaultRegionHttpPort = 9000;

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

@ -362,9 +362,6 @@ namespace OpenSim
{ {
m_configSettings.PhysicsEngine = startupConfig.GetString("physics"); m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
m_configSettings.MeshEngineName = startupConfig.GetString("meshing"); 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.StorageDll = startupConfig.GetString("storage_plugin");
m_configSettings.ClientstackDll m_configSettings.ClientstackDll

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

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

2
OpenSim/Tests/Common/Helpers/SceneHelpers.cs
View File

@ -108,7 +108,7 @@ namespace OpenSim.Tests.Common
IConfigSource configSource = new IniConfigSource(); IConfigSource configSource = new IniConfigSource();
TestScene testScene = new TestScene( TestScene testScene = new TestScene(
regInfo, acm, scs, simDataService, estateDataService, null, false, false, configSource, null); regInfo, acm, scs, simDataService, estateDataService, null, false, configSource, null);
IRegionModule godsModule = new GodsModule(); IRegionModule godsModule = new GodsModule();
godsModule.Initialise(testScene, new IniConfigSource()); godsModule.Initialise(testScene, new IniConfigSource());

8
OpenSim/Tests/Common/Mock/TestScene.cs
View File

@ -42,18 +42,18 @@ namespace OpenSim.Tests.Common.Mock
RegionInfo regInfo, AgentCircuitManager authen, RegionInfo regInfo, AgentCircuitManager authen,
SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService, SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
ModuleLoader moduleLoader, bool dumpAssetsToFile, ModuleLoader moduleLoader, bool dumpAssetsToFile,
bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion) IConfigSource config, string simulatorVersion)
: base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader, : base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader,
dumpAssetsToFile, SeeIntoRegionFromNeighbor, config, simulatorVersion) dumpAssetsToFile, config, simulatorVersion)
{ {
} }
/// <summary> /// <summary>
/// Temporarily override session authentication for tests (namely teleport). /// Temporarily override session authentication for tests (namely teleport).
/// </summary> /// </summary>
/// /// <remarks>
/// TODO: This needs to be mocked out properly. /// TODO: This needs to be mocked out properly.
/// /// </remarks>
/// <param name="agent"></param> /// <param name="agent"></param>
/// <returns></returns> /// <returns></returns>
public override bool VerifyUserPresence(AgentCircuitData agent, out string reason) public override bool VerifyUserPresence(AgentCircuitData agent, out string reason)