From 52faae69d52dbb10eb2cf8708fea966b310b2391 Mon Sep 17 00:00:00 2001
From: MW
Date: Wed, 30 May 2007 18:52:38 +0000
Subject: We have successful login!

---
 OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs |  2 +-
 OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs |  5 +----
 OpenSim/OpenSim.World/Avatar.Update.cs                    |  1 +
 OpenSim/OpenSim.World/Avatar.cs                           | 15 ++++++++-------
 OpenSim/OpenSim/OpenSimMain.cs                            |  1 +
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 3c39781..9fb52c6 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -50,7 +50,7 @@ namespace OpenSim
             this.m_inventoryCache.ClientLeaving(this.AgentID, null);
 
 
-            m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
+           // m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
             /*lock (m_world.Entities)
             {
                 m_world.Entities.Remove(this.AgentID);
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 0964fc4..d215a23 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -38,10 +38,7 @@ namespace OpenSim
             else
             {
                 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
-                if (Pack.Type != PacketType.PacketAck)
-                {
-                    Console.WriteLine(Pack.Type.ToString());
-                }
+               
                 switch (Pack.Type)
                 {
                     case PacketType.ViewerEffect:
diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 90be4b1..9a5e06c 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -28,6 +28,7 @@ namespace OpenSim.world
 
         public void SendInitialPosition()
         {
+            Console.WriteLine("sending initial Avatar data");
             this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 100));
         }
 
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index bbc3a58..247e194 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -32,30 +32,30 @@ namespace OpenSim.world
         private AvatarWearable[] Wearables;
         private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
         private ulong m_regionHandle;
-        //private Dictionary<uint, ClientView> m_clientThreads;
+        private Dictionary<uint, IClientAPI> m_clientThreads;
         private string m_regionName;
         private ushort m_regionWaterHeight;
         private bool m_regionTerraform;
         private bool childAvatar = false;
         private RegionInfo regionData;
 
-        public Avatar(IClientAPI TheClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat)
+        public Avatar(IClientAPI theClient, World world, Dictionary<uint, IClientAPI> clientThreads, RegionInfo regionDat)
         {
-            Console.WriteLine("avatar point 1");
+
             m_world = world;
-            // m_clientThreads = clientThreads;
+            m_clientThreads = clientThreads;
+            regionData = regionDat;
+            this.uuid = theClient.AgentId;
             m_regionName = regionData.RegionName;
             m_regionHandle = regionData.RegionHandle;
             m_regionTerraform = regionData.RegionTerraform;
             m_regionWaterHeight = regionData.RegionWaterHeight;
-            Console.WriteLine("avatar point 2");
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
-            ControllingClient = TheClient;
+            ControllingClient = theClient;
             this.firstname = ControllingClient.FirstName;
             this.lastname = ControllingClient.LastName;
             localid = 8880000 + (this.m_world._localNumber++);
             Pos = ControllingClient.StartPos;
-            Console.WriteLine("avatar point 3");
             visualParams = new byte[218];
             for (int i = 0; i < 218; i++)
             {
@@ -136,6 +136,7 @@ namespace OpenSim.world
         //really really should be moved somewhere else (RegionInfo.cs ?)
         public void SendRegionHandshake()
         {
+            Console.WriteLine("sending handshake");
             this.ControllingClient.SendRegionHandshake(this.regionData);
         }
 
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index db17db2..acbc15e 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -93,6 +93,7 @@ namespace OpenSim
             this.serversData.InitConfig(this.m_sandbox, this.localConfig);
             this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
 
+            ClientView.TerrainManager = new TerrainManager(new SecondLife());
             if (m_sandbox)
             {
                 this.SetupLocalGridServers();
-- 
cgit v1.1