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

Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge 

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
avinationmerge
Melanie 2011-10-25 01:55:01 +01:00
parent 3cdea11e29 528cc8136e
commit f50538c81a
7 changed files with 29 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Framework/ConfigSettings.cs
View File

@ -35,12 +35,9 @@ namespace OpenSim.Framework
public string StorageDll { get; set; }
public string ClientstackDll { get; set; }
/// <summary>
/// Controls whether physics can be applied to prims. Even if false, prims still have entries in a
/// PhysicsScene in order to perform collision detection
/// </summary>
public bool PhysicalPrim { get; set; }
public string LibrariesXMLFile { get; set; }
public const uint DefaultRegionHttpPort = 9000;

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

@ -362,7 +362,6 @@ namespace OpenSim
{
m_configSettings.PhysicsEngine = startupConfig.GetString("physics");
m_configSettings.MeshEngineName = startupConfig.GetString("meshing");
m_configSettings.PhysicalPrim = startupConfig.GetBoolean("physical_prim", true);
m_configSettings.See_into_region_from_neighbor = startupConfig.GetBoolean("see_into_this_sim_from_neighbor", true);

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

@ -742,7 +742,7 @@ namespace OpenSim
return new Scene(
regionInfo, circuitManager, sceneGridService,
simDataService, estateDataService, m_moduleLoader, false, m_configSettings.PhysicalPrim,
simDataService, estateDataService, m_moduleLoader, false,
m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
}

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

@ -73,8 +73,12 @@ namespace OpenSim.Region.Framework.Scenes
public List<Border> SouthBorders = new List<Border>();
public List<Border> WestBorders = new List<Border>();
/// <summary>Are we applying physics to any of the prims in this scene?</summary>
/// <summary>
/// Controls whether physics can be applied to prims. Even if false, prims still have entries in a
/// PhysicsScene in order to perform collision detection
/// </summary>
public bool m_physicalPrim;
public float m_maxNonphys = 256;
public float m_maxPhys = 10;
public bool m_clampPrimSize;
@ -552,7 +556,7 @@ namespace OpenSim.Region.Framework.Scenes
public Scene(RegionInfo regInfo, AgentCircuitManager authen,
SceneCommunicationService sceneGridService,
ISimulationDataService simDataService, IEstateDataService estateDataService,
ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
ModuleLoader moduleLoader, bool dumpAssetsToFile,
bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
: this(regInfo)
{
@ -574,6 +578,7 @@ namespace OpenSim.Region.Framework.Scenes
m_lastOutgoing = 0;
m_physicalPrim = physicalPrim;
m_seeIntoRegionFromNeighbor = SeeIntoRegionFromNeighbor;
m_asyncSceneObjectDeleter = new AsyncSceneObjectGroupDeleter(this);
@ -697,6 +702,9 @@ namespace OpenSim.Region.Framework.Scenes
m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false);
// TODO: Change default to true once the feature is supported
m_usePreJump = startupConfig.GetBoolean("enableprejump", true);
m_physicalPrim = startupConfig.GetBoolean("physical_prim", true);
m_maxNonphys = startupConfig.GetFloat("NonPhysicalPrimMax", m_maxNonphys);
m_log.DebugFormat("[SCENE]: prejump is {0}", m_usePreJump ? "ON" : "OFF");

51
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -130,20 +130,15 @@ namespace OpenSim.Region.Framework.Scenes
#region Fields
public bool AllowedDrop;
public bool DIE_AT_EDGE;
public bool RETURN_AT_EDGE;
public bool BlockGrab;
public bool StatusSandbox;
public Vector3 StatusSandboxPos;
[XmlIgnore]
@ -166,29 +161,21 @@ namespace OpenSim.Region.Framework.Scenes
// for SL compatibility it should be persisted though (set sound / displaytext / particlesystem, kill script)
public UUID Sound;
public byte SoundFlags;
public double SoundGain;
public double SoundRadius;
public uint TimeStampFull;
public uint TimeStampLastActivity; // Will be used for AutoReturn
public uint TimeStampTerse;
public byte SoundFlags;
public double SoundGain;
public double SoundRadius;
public uint TimeStampFull;
public uint TimeStampLastActivity; // Will be used for AutoReturn
public uint TimeStampTerse;
public UUID FromItemID;
public UUID FromFolderID;
// The following two are to hold the attachment data
@ -202,13 +189,10 @@ namespace OpenSim.Region.Framework.Scenes
[XmlIgnore]
public int STATUS_ROTATE_X;
public int STATUS_ROTATE_Y;
public int STATUS_ROTATE_Z;
private Dictionary<int, string> m_CollisionFilter = new Dictionary<int, string>();
/// <value>
@ -225,35 +209,26 @@ namespace OpenSim.Region.Framework.Scenes
public scriptEvents AggregateScriptEvents;
public Vector3 AttachedPos;
public Vector3 RotationAxis = Vector3.One;
public bool VolumeDetectActive; // XmlIgnore set to avoid problems with persistance until I come to care for this
// Certainly this must be a persistant setting finally
public bool IsWaitingForFirstSpinUpdatePacket;
public Quaternion SpinOldOrientation = Quaternion.Identity;
public Quaternion m_APIDTarget = Quaternion.Identity;
public float m_APIDDamp = 0;
public float m_APIDStrength = 0;
/// <summary>
/// This part's inventory
/// </summary>
/// </summary>
public IEntityInventory Inventory
{
get { return m_inventory; }

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

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

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

@ -41,10 +41,10 @@ namespace OpenSim.Tests.Common.Mock
public TestScene(
RegionInfo regInfo, AgentCircuitManager authen,
SceneCommunicationService sceneGridService, ISimulationDataService simDataService, IEstateDataService estateDataService,
ModuleLoader moduleLoader, bool dumpAssetsToFile, bool physicalPrim,
ModuleLoader moduleLoader, bool dumpAssetsToFile,
bool SeeIntoRegionFromNeighbor, IConfigSource config, string simulatorVersion)
: base(regInfo, authen, sceneGridService, simDataService, estateDataService, moduleLoader,
dumpAssetsToFile, physicalPrim, SeeIntoRegionFromNeighbor, config, simulatorVersion)
dumpAssetsToFile, SeeIntoRegionFromNeighbor, config, simulatorVersion)
{
}