diff options
| author | Melanie | 2013-11-23 19:13:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-23 19:13:22 +0000 |
| commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
| tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /bin/OpenSim.32BitLaunch.exe.config | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to 'bin/OpenSim.32BitLaunch.exe.config')
| -rw-r--r-- | bin/OpenSim.32BitLaunch.exe.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config index 6a6b3c8..a07ace3 100644 --- a/bin/OpenSim.32BitLaunch.exe.config +++ b/bin/OpenSim.32BitLaunch.exe.config | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | 4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> |
| 5 | </configSections> | 5 | </configSections> |
| 6 | <runtime> | 6 | <runtime> |
| 7 | <loadFromRemoteSources enabled="true" /> | ||
| 7 | <gcConcurrent enabled="true" /> | 8 | <gcConcurrent enabled="true" /> |
| 8 | <gcServer enabled="true" /> | 9 | <gcServer enabled="true" /> |
| 9 | </runtime> | 10 | </runtime> |