diff options
| author | Melanie | 2013-11-08 17:55:01 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-08 17:55:01 +0000 |
| commit | 91b70bf3fe382729a94d9a0855be8b07ef67c360 (patch) | |
| tree | 3e42c4c536da6c7eaaf1a72ecdbd2a24de4d1658 /OpenSim/Framework | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | If the LSL state_entry() event definition contains any parameters, then gener... (diff) | |
| download | opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.zip opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.gz opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.bz2 opensim-SC-91b70bf3fe382729a94d9a0855be8b07ef67c360.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
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 | ||