diff options
| author | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-06-21 00:39:55 +0200 |
| commit | 159fcbf150b7da0e229b29aa7b94793484543d12 (patch) | |
| tree | b8c0ff3b4c758a3fba8315b556c923ef4c02a185 /bin/pCampBot.exe.config | |
| parent | Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.zip opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.gz opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.bz2 opensim-SC_OLD-159fcbf150b7da0e229b29aa7b94793484543d12.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
Diffstat (limited to 'bin/pCampBot.exe.config')
| -rwxr-xr-x | bin/pCampBot.exe.config | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/pCampBot.exe.config b/bin/pCampBot.exe.config index 9cfb7e9..7912991 100755 --- a/bin/pCampBot.exe.config +++ b/bin/pCampBot.exe.config | |||
| @@ -3,6 +3,9 @@ | |||
| 3 | <configSections> | 3 | <configSections> |
| 4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | 4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> |
| 5 | </configSections> | 5 | </configSections> |
| 6 | <runtime> | ||
| 7 | <loadFromRemoteSources enabled="true" /> | ||
| 8 | </runtime> | ||
| 6 | <appSettings> | 9 | <appSettings> |
| 7 | </appSettings> | 10 | </appSettings> |
| 8 | <log4net> | 11 | <log4net> |