Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 13 insertions, 3 deletions

diff --git a/bin/OpenSim.32BitLaunch.exe.config b/bin/OpenSim.32BitLaunch.exe.config
index 6ac0206..5dc82a6 100644
--- a/bin/OpenSim.32BitLaunch.exe.config
+++ b/bin/OpenSim.32BitLaunch.exe.config
@@ -4,19 +4,24 @@
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
   <runtime>
+    <supportedRuntime version="v2.0.50727"/>
+    
     <gcConcurrent enabled="true" />
-        <gcServer enabled="true" />
+    <gcServer enabled="true" />
   </runtime>
   <appSettings>
   </appSettings>
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date{HH:mm:ss} - %message%newline" />
+        <conversionPattern value="%date{HH:mm:ss} - %message" />
+        <!-- console log with milliseconds.  Useful for debugging -->
+        <!--        <conversionPattern value="%date{HH:mm:ss.fff} - %message" /> -->
       </layout>
     </appender>
+
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.32BitLaunch.log" />
+      <file value="OpenSim.log" />
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
@@ -28,5 +33,10 @@
       <appender-ref ref="Console" />
       <appender-ref ref="LogFileAppender" />
     </root>
+
+    <logger name="OpenSim.Region.ScriptEngine.XEngine">
+      <level value="INFO"/>
+    </logger>
+
   </log4net>
 </configuration>