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

Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
This commit is contained in:
Melanie
2011-10-25 01:55:01 +01:00
parent 3cdea11e29 528cc8136e
commit f50538c81a
7 changed files with 29 additions and 50 deletions
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;