Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 27 insertions, 18 deletions

diff --git a/bin/Robust.32BitLaunch.exe.config b/bin/Robust32.vshost.exe.config
index 8706574..ca3ee0e 100644
--- a/bin/Robust.32BitLaunch.exe.config
+++ b/bin/Robust32.vshost.exe.config
@@ -1,63 +1,72 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
   </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0" />
+  </startup>
   <runtime>
     <loadFromRemoteSources enabled="true" />
-    <gcConcurrent enabled="true" />
-        <gcServer enabled="true" />
   </runtime>
   <appSettings>
+    <add key="ClientSettingsProvider.ServiceUri" value="" />
   </appSettings>
   <log4net>
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <filter type="log4net.Filter.LoggerMatchFilter">
-        <loggerToMatch value="special"/>
-        <acceptOnMatch value="false"/>
+        <loggerToMatch value="special" />
+        <acceptOnMatch value="false" />
       </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date{HH:mm:ss} - %message" />
       </layout>
     </appender>
-
-<!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
+    <!-- If you want automatic log-rolling then use RollingFileAppender instead of FileAppender:
     <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <file value="../logs/Robust.32BitLaunch.log" />
+      <file value="log/Robust.log" />
       <rollingStyle value="Date" />
       <datePattern value="'.'yyyy-MM-dd"/>
       ...
 -->
-
     <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value=../logs/"Robust.32BitLaunch.log" />
+      <file value="Robust.log" />
       <appendToFile value="true" />
       <filter type="log4net.Filter.LoggerMatchFilter">
-        <loggerToMatch value="special"/>
-        <acceptOnMatch value="false"/>
+        <loggerToMatch value="special" />
+        <acceptOnMatch value="false" />
       </filter>
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date %-5level - %logger %message%newline" />
       </layout>
     </appender>
-
     <appender name="StatsLogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="../logs/RobustStats.log"/>
+      <file value="RobustStats.log" />
       <appendToFile value="true" />
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date - %message%newline" />
       </layout>
     </appender>
-
     <root>
       <level value="DEBUG" />
       <appender-ref ref="Console" />
       <appender-ref ref="LogFileAppender" />
     </root>
-
     <!-- used for stats recording -->
     <logger name="special.StatsLogger">
-      <appender-ref ref="StatsLogFileAppender"/>
+      <appender-ref ref="StatsLogFileAppender" />
     </logger>
   </log4net>
-</configuration>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
\ No newline at end of file