3 files changed, 21 insertions, 12 deletions

diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index b07a4d6..954d3c3 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -53,16 +53,16 @@ namespace OpenSim
             
             Console.WriteLine("Starting...\n");
 
-            ArgvConfigSource source = new ArgvConfigSource(args);
+            ArgvConfigSource configSource = new ArgvConfigSource(args);
 
-            source.AddSwitch("Startup", "inifile");
-            source.AddSwitch("Startup", "configfile");
-            source.AddSwitch("Startup", "gridmode");
-            source.AddSwitch("Startup", "physics");
-            source.AddSwitch("Startup", "config");
-            source.AddSwitch("Startup", "noverbose");
+            configSource.AddSwitch("Startup", "inifile");
+            configSource.AddSwitch("Startup", "configfile");
+            configSource.AddSwitch("Startup", "gridmode");
+            configSource.AddSwitch("Startup", "physics");
+            configSource.AddSwitch("Startup", "config");
+            configSource.AddSwitch("Startup", "noverbose");
 
-            OpenSimMain sim = new OpenSimMain(source);
+            OpenSimMain sim = new OpenSimMain(configSource);
 
             sim.StartUp();
 
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e57ba27..248bd42 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -77,14 +77,14 @@ namespace OpenSim
             string iniFile = startupSource.Configs["Startup"].GetString("inifile", "NA");
             if (iniFile != "NA")
             {
-                //a ini is set to be used for startup settings
+                //a INI file is set to be used for startup settings
                 string iniFilePath = Path.Combine(Util.configDir(), iniFile);
                 if (File.Exists(iniFilePath))
                 {
                     startupSource = new IniConfigSource(iniFilePath);
 
                     //enable follow line, if we want the original config source(normally commandline args) merged with ini file settings.
-                    //in this case we have it so if both sources have the same named setting, command line value will overwrite the ini file value. 
+                    //in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value. 
                     //(as if someone has bothered to enter a command line arg, we should take notice of it)
                     //startupSource.Merge(configSource); 
                 }
@@ -121,6 +121,15 @@ namespace OpenSim
                 m_httpServer.AddStreamHandler(new SimStatusHandler());
             }
 
+            if (m_sandbox)
+            {
+                m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
+            }
+            else
+            {
+                m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
+            }
+
             string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
             
             if (!Directory.Exists(regionConfigPath))
@@ -227,6 +236,7 @@ namespace OpenSim
         }
 
         #endregion
+
         /// <summary>
         /// Performs any last-minute sanity checking and shuts down the region server
         /// </summary>
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 5683b31..c67ae66 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -41,7 +41,6 @@ using libsecondlife;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Caches;
-using OpenSim.Region.Communications.Local;
 
 namespace OpenSim.Region.ClientStack
 {
@@ -79,7 +78,7 @@ namespace OpenSim.Region.ClientStack
             m_httpServer.Start();
 
             m_inventoryCache = new InventoryCache();
-            m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
+           
         }
 
         protected abstract void Initialize();