diff options
| author | Robert Adams | 2013-11-04 22:12:57 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-04 22:12:57 -0800 |
| commit | c931b16c1fd50d3b955662c8cd6134d7a235c519 (patch) | |
| tree | 8aeca3e6dccf6b177908f3842196f59230777109 /OpenSim/Framework | |
| parent | varregion: add plumbing to pass region size from Scene down to the (diff) | |
| parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
| download | opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.zip opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.gz opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.bz2 opensim-SC_OLD-c931b16c1fd50d3b955662c8cd6134d7a235c519.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/ConfigSettings.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 002a371..108a3e4 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs | |||
| @@ -31,7 +31,6 @@ 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 string StorageDll { get; set; } | ||
| 35 | public string ClientstackDll { get; set; } | 34 | public string ClientstackDll { get; set; } |
| 36 | public string LibrariesXMLFile { get; set; } | 35 | public string LibrariesXMLFile { get; set; } |
| 37 | 36 | ||