diff options
| author | Melanie | 2011-10-25 02:14:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-25 02:14:39 +0100 |
| commit | 353f0c0e03499453dbeb2e39a85fcc99788fedf2 (patch) | |
| tree | 29fd038531f3b60b8d034edf8b4a2808f78cb70d /OpenSim/Framework | |
| parent | Merge (diff) | |
| parent | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with t... (diff) | |
| download | opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.zip opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.gz opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.bz2 opensim-SC-353f0c0e03499453dbeb2e39a85fcc99788fedf2.tar.xz | |
Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/ConfigSettings.cs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 2768f70..002a371 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs | |||
| @@ -31,13 +31,8 @@ namespace OpenSim.Framework | |||
| 31 | { | 31 | { |
| 32 | public string PhysicsEngine { get; set; } | 32 | public string PhysicsEngine { get; set; } |
| 33 | public string MeshEngineName { get; set; } | 33 | public string MeshEngineName { get; set; } |
| 34 | public bool See_into_region_from_neighbor { get; set; } | ||
| 35 | public string StorageDll { get; set; } | 34 | public string StorageDll { get; set; } |
| 36 | public string ClientstackDll { get; set; } | 35 | public string ClientstackDll { get; set; } |
| 37 | |||
| 38 | |||
| 39 | public bool PhysicalPrim { get; set; } | ||
| 40 | |||
| 41 | public string LibrariesXMLFile { get; set; } | 36 | public string LibrariesXMLFile { get; set; } |
| 42 | 37 | ||
| 43 | public const uint DefaultRegionHttpPort = 9000; | 38 | public const uint DefaultRegionHttpPort = 9000; |