ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 11:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2016-12-23 02:53:58 +00:00
parent 4bdf89d59b 2e7e4427d0
commit 86cc02f33e
13 changed files with 600 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@@ -348,13 +348,10 @@ namespace OpenSim
config.Set("meshing", "Meshmerizer");
config.Set("physical_prim", true);
config.Set("serverside_object_permissions", true);
config.Set("storage_prim_inventories", true);
config.Set("startup_console_commands_file", String.Empty);
config.Set("shutdown_console_commands_file", String.Empty);
config.Set("DefaultScriptEngine", "XEngine");
config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
// life doesn't really work without this
config.Set("EventQueue", true);
}
{
@@ -387,4 +384,4 @@ namespace OpenSim
m_networkServersInfo.loadFromConfiguration(m_config.Source);
}
}
}
}