a bit more refactoring

1 files changed, 6 insertions, 12 deletions

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 55dab3b..f78873d 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -126,10 +126,16 @@ namespace OpenSim
             if (m_sandbox)

             {

                 this.SetupLocalGridServers();

+                //Authenticate Session Handler

+                AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();

+                this.AuthenticateSessionsHandler = authen;

             }

             else

             {

                 this.SetupRemoteGridServers();

+                //Authenticate Session Handler

+                AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();

+                this.AuthenticateSessionsHandler = authen;

             }

 

             startuptime = DateTime.Now;

@@ -145,18 +151,6 @@ namespace OpenSim
                 Environment.Exit(1);

             }

 

-            //Authenticate Session Handler

-            if (m_sandbox)

-            {

-                AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();

-                this.AuthenticateSessionsHandler = authen;

-            }

-            else

-            {

-                AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();

-                this.AuthenticateSessionsHandler = authen;

-            }

-

             m_udpServer = new UDPServer(this.regionData.IPListenPort, this.GridServers, this.AssetCache, this.InventoryCache, this.regionData, this.m_sandbox, this.user_accounts, this.m_console, this.AuthenticateSessionsHandler);

             

             //should be passing a IGenericConfig object to these so they can read the config data they want from it