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/SimpleApp.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_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC_OLD-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 '')
| -rw-r--r-- | bin/SimpleApp.exe.config | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/bin/SimpleApp.exe.config b/bin/SimpleApp.exe.config deleted file mode 100644 index c4d9c22..0000000 --- a/bin/SimpleApp.exe.config +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8" ?> | ||
| 2 | <configuration> | ||
| 3 | <configSections> | ||
| 4 | <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" /> | ||
| 5 | </configSections> | ||
| 6 | <appSettings> | ||
| 7 | </appSettings> | ||
| 8 | <log4net> | ||
| 9 | <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console"> | ||
| 10 | <layout type="log4net.Layout.PatternLayout"> | ||
| 11 | <conversionPattern value="%date{HH:mm:ss} - %message%newline" /> | ||
| 12 | </layout> | ||
| 13 | </appender> | ||
| 14 | <appender name="LogFileAppender" type="log4net.Appender.FileAppender"> | ||
| 15 | <file value="SimpleApp.log" /> | ||
| 16 | <appendToFile value="true" /> | ||
| 17 | <layout type="log4net.Layout.PatternLayout"> | ||
| 18 | <conversionPattern value="%date %-5level - %logger %message%newline" /> | ||
| 19 | </layout> | ||
| 20 | </appender> | ||
| 21 | |||
| 22 | <root> | ||
| 23 | <level value="DEBUG" /> | ||
| 24 | <appender-ref ref="Console" /> | ||
| 25 | <appender-ref ref="LogFileAppender" /> | ||
| 26 | </root> | ||
| 27 | </log4net> | ||
| 28 | </configuration> | ||