5 files changed, 4 insertions, 77 deletions

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index bf59f8e..a6cd918 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -1221,11 +1221,13 @@ namespace OpenSim.Framework.Communications.Services
                 {
                     return Util.CreateUnknownUserErrorResponse();
                 }
+                
                 UUID.TryParse((string)requestData["session_id"], out guess_sid);
                 if (guess_sid == UUID.Zero)
                 {
                     return Util.CreateUnknownUserErrorResponse();
                 }
+                
                 if (m_userManager.VerifySession(guess_aid, guess_sid))
                 {
                     authed = "TRUE";
@@ -1243,6 +1245,5 @@ namespace OpenSim.Framework.Communications.Services
             response.Value = responseData;
             return response;
         }
-
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index baf0fd3..a92226d 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -260,8 +260,6 @@ namespace OpenSim.Grid.UserServer
             m_userManager.PostInitialise();
             m_avatarAppearanceModule.PostInitialise();
             m_friendsModule.PostInitialise();
-
-            m_avatarAppearanceModule.PostInitialise();
         }
 
         protected virtual void RegisterHttpHandlers()
@@ -276,8 +274,6 @@ namespace OpenSim.Grid.UserServer
             m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
             m_messagesService.RegisterHandlers(m_httpServer);
             m_gridInfoService.RegisterHandlers(m_httpServer);
-
-            m_avatarAppearanceModule.RegisterHandlers(m_httpServer);
         }
 
         public override void ShutdownSpecific()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d4d5ccc..4c52b11 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
+ 
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/bin/OpenSim.Grid.AssetServer.exe.config b/bin/OpenSim.Grid.AssetServer.exe.config
deleted file mode 100644
index 58404fd..0000000
--- a/bin/OpenSim.Grid.AssetServer.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <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" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.AssetServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>
diff --git a/bin/OpenSim.Grid.InventoryServer.exe.config b/bin/OpenSim.Grid.InventoryServer.exe.config
deleted file mode 100644
index b1315c1..0000000
--- a/bin/OpenSim.Grid.InventoryServer.exe.config
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler,log4net" />
-  </configSections>
-  <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" />
-      </layout>
-    </appender>
-    <appender name="LogFileAppender" type="log4net.Appender.FileAppender">
-      <file value="OpenSim.Grid.InventoryServer.log" />
-      <appendToFile value="true" />
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date %-5level - %logger %message%newline" />
-      </layout>
-    </appender>
-
-    <!-- if you'd like to know what NHibernate is doing more set value="DEBUG" -->
-    <logger name="NHibernate" additivity="false">
-      <level value="INFO"/>
-      <appender-ref ref="NHibernateFileLog"/>
-    </logger>
-
-
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="Console" />
-      <appender-ref ref="LogFileAppender" />
-    </root>
-  </log4net>
-</configuration>