diff options
| author | Melanie | 2011-10-25 01:55:01 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 01:55:01 +0100 |
| commit | f50538c81afe4c44e491c867cebb1674b682147b (patch) | |
| tree | d2e7b8e9e4eb7cb41217265ad25da6153d477b79 /OpenSim/Framework | |
| parent | Merge commit '5ddefc256468e4b394d82a2c4bc69fe28c4b59ea' into bigmerge (diff) | |
| parent | fetch physical_prim switch from [Startup] config from inside scene, as is don... (diff) | |
| download | opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.zip opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.gz opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.bz2 opensim-SC-f50538c81afe4c44e491c867cebb1674b682147b.tar.xz | |
Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/ConfigSettings.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 6ee7fee..2768f70 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs | |||
| @@ -35,12 +35,9 @@ namespace OpenSim.Framework | |||
| 35 | public string StorageDll { get; set; } | 35 | public string StorageDll { get; set; } |
| 36 | public string ClientstackDll { get; set; } | 36 | public string ClientstackDll { get; set; } |
| 37 | 37 | ||
| 38 | /// <summary> | 38 | |
| 39 | /// Controls whether physics can be applied to prims. Even if false, prims still have entries in a | ||
| 40 | /// PhysicsScene in order to perform collision detection | ||
| 41 | /// </summary> | ||
| 42 | public bool PhysicalPrim { get; set; } | 39 | public bool PhysicalPrim { get; set; } |
| 43 | 40 | ||
| 44 | public string LibrariesXMLFile { get; set; } | 41 | public string LibrariesXMLFile { get; set; } |
| 45 | 42 | ||
| 46 | public const uint DefaultRegionHttpPort = 9000; | 43 | public const uint DefaultRegionHttpPort = 9000; |