From ed899c30f693138b4f69220b920e5456a9307bee Mon Sep 17 00:00:00 2001
From: MW
Date: Sat, 9 Jun 2007 22:06:39 +0000
Subject: a couple of changes/fixes

---
 OpenSim/OpenSim.World/Avatar.Update.cs | 3 +--
 OpenSim/OpenSim.World/Avatar.cs        | 6 +++---
 OpenSim/OpenSim/OpenSimMain.cs         | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 7a57ba4..c0d120a 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -42,8 +42,7 @@ namespace OpenSim.world
         /// </summary>
         public void SendInitialPosition()
         {
-            Console.WriteLine("sending initial Avatar data");
-            this.ControllingClient.SendAvatarData(m_regInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
+            this.ControllingClient.SendAvatarData(m_regionInfo, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 60));
         }
 
         /// <summary>
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index 4ab576c..77e0300 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -35,7 +35,7 @@ namespace OpenSim.world
         private Dictionary<uint, IClientAPI> m_clientThreads;
         private bool childAvatar = false;
 
-        private RegionInfo m_regInfo;
+        protected RegionInfo m_regionInfo;
         /// <summary>
         /// 
         /// </summary>
@@ -50,7 +50,7 @@ namespace OpenSim.world
             m_clientThreads = clientThreads;
             this.uuid = theClient.AgentId;
 
-            m_regInfo = reginfo;
+            m_regionInfo = reginfo;
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
             ControllingClient = theClient;
             this.firstname = ControllingClient.FirstName;
@@ -144,7 +144,7 @@ namespace OpenSim.world
         /// </summary>
         public void CompleteMovement()
         {
-            this.ControllingClient.MoveAgentIntoRegion(m_regInfo);
+            this.ControllingClient.MoveAgentIntoRegion(m_regionInfo);
         }
 
         /// <summary>
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 78dcc8f..53adce9 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -103,12 +103,13 @@ namespace OpenSim
                 this.SetupLocalGridServers();
                 this.checkServer = new CheckSumServer(12036);
                 this.checkServer.ServerListener();
-                this.commsManager = new RegionServerCommsOGS();
+                this.commsManager = new RegionServerCommsLocal(); 
+                new RegionServerCommsOGS();
             }
             else
             {
                 this.SetupRemoteGridServers();
-                this.commsManager = new RegionServerCommsLocal();
+                this.commsManager = new RegionServerCommsOGS();
             }
 
             startuptime = DateTime.Now;
-- 
cgit v1.1