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 branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
This commit is contained in:
Melanie
2013-11-08 17:55:01 +00:00
parent ba203ed94f 2b069a3b1e
commit 91b70bf3fe
34 changed files with 8041 additions and 7691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/ConfigSettings.cs
View File

@@ -31,7 +31,6 @@ namespace OpenSim.Framework
{
public string PhysicsEngine { get; set; }
public string MeshEngineName { get; set; }
public string StorageDll { get; set; }
public string ClientstackDll { get; set; }
public string LibrariesXMLFile { get; set; }