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

Allow megaregions to be used in M7, should we so decide

avinationmerge
Melanie Thielker 2010-07-21 12:31:59 +02:00 committed by Melanie
parent 9136e02ed3
commit 316854dc13
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,6 +146,7 @@ namespace OpenSim.Region.Framework.Scenes
protected SceneCommunicationService m_sceneGridService;
public bool LoginsDisabled = true;
public bool LoadingPrims = false;
public bool CombineRegions = false;
public new float TimeDilation
{
@ -656,6 +657,7 @@ namespace OpenSim.Region.Framework.Scenes
}
m_strictAccessControl = startupConfig.GetBoolean("StrictAccessControl", m_strictAccessControl);
CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
IConfig interest_management_config = m_config.Configs["InterestManagement"];
if (interest_management_config != null)

3
OpenSim/Region/Framework/Scenes/SceneGraph.cs
View File

@ -225,6 +225,8 @@ namespace OpenSim.Region.Framework.Scenes
/// </returns>
protected internal bool AddRestoredSceneObject(
SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
{
if (!m_parentScene.CombineRegions)
{
// KF: Check for out-of-region, move inside and make static.
Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
@ -249,6 +251,7 @@ namespace OpenSim.Region.Framework.Scenes
sceneObject.RootPart.Acceleration = Vector3.Zero;
sceneObject.RootPart.Velocity = Vector3.Zero;
}
}
if (!alreadyPersisted)
{