From b2f16fd4e1f95ba4c4f95cbbd43088943eaa125f Mon Sep 17 00:00:00 2001
From: MW
Date: Tue, 29 May 2007 18:07:17 +0000
Subject: Now We need to test to see if we can login

---
 Common/OpenSim.Framework/Interfaces/IClientAPI.cs | 10 ++++++++++
 OpenSim/OpenSim.RegionServer/ClientView.API.cs    | 17 +++++++++++++++++
 OpenSim/OpenSim.RegionServer/ClientView.cs        |  8 ++++----
 OpenSim/OpenSim.World/Avatar.Update.cs            |  4 ++--
 OpenSim/OpenSim.World/Avatar.cs                   |  6 ++++--
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
index 06b3075..5c5cda4 100644
--- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
+++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -67,6 +67,16 @@ namespace OpenSim.Framework.Interfaces
             get;
         }
 
+        string FirstName
+        {
+            get;
+        }
+
+        string LastName
+        {
+            get;
+        }
+
         void OutPacket(Packet newPack);
         void SendWearables(AvatarWearable[] wearables);
         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.API.cs b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
index 4177dff..e7db495 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.API.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.API.cs
@@ -56,6 +56,23 @@ namespace OpenSim
             }
         }
 
+        public string FirstName
+        {
+            get
+            {
+                return this.firstName;
+            }
+
+        }
+
+        public string LastName
+        {
+            get
+            {
+                return this.lastName;
+            }
+        }
+
         #region World/Avatar to Client
 
         public void MoveAgentIntoRegion(RegionInfo regInfo)
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index 4d1634c..6963a0b 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -60,8 +60,8 @@ namespace OpenSim
         public LLUUID AgentID;
         public LLUUID SessionID;
         public LLUUID SecureSessionID = LLUUID.Zero;
-        public string FirstName;
-        public string LastName;
+        public string firstName;
+        public string lastName;
         public bool m_child = false;
         private UseCircuitCodePacket cirpack;
         public Thread ClientThread;
@@ -250,8 +250,8 @@ namespace OpenSim
                 this.AgentID = cirpack.CircuitCode.ID;
                 this.SessionID = cirpack.CircuitCode.SessionID;
                 this.CircuitCode = cirpack.CircuitCode.Code;
-                this.FirstName = sessionInfo.LoginInfo.First;
-                this.LastName = sessionInfo.LoginInfo.Last;
+                this.firstName = sessionInfo.LoginInfo.First;
+                this.lastName = sessionInfo.LoginInfo.Last;
 
                 if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
                 {
diff --git a/OpenSim/OpenSim.World/Avatar.Update.cs b/OpenSim/OpenSim.World/Avatar.Update.cs
index 13a480a..90be4b1 100644
--- a/OpenSim/OpenSim.World/Avatar.Update.cs
+++ b/OpenSim/OpenSim.World/Avatar.Update.cs
@@ -28,7 +28,7 @@ namespace OpenSim.world
 
         public void SendInitialPosition()
         {
-           
+            this.ControllingClient.SendAvatarData(this.regionData, this.firstname, this.lastname, this.uuid, this.localid, new LLVector3(128, 128, 100));
         }
 
         public void SendOurAppearance()
@@ -38,7 +38,7 @@ namespace OpenSim.world
 
         public void SendOurAppearance(IClientAPI OurClient)
         {
-           
+            this.ControllingClient.SendWearables(this.Wearables);
         }
 
         public void SendAppearanceToOtherAgent(Avatar avatarInfo)
diff --git a/OpenSim/OpenSim.World/Avatar.cs b/OpenSim/OpenSim.World/Avatar.cs
index ee5aa44..5b66fce 100644
--- a/OpenSim/OpenSim.World/Avatar.cs
+++ b/OpenSim/OpenSim.World/Avatar.cs
@@ -50,6 +50,8 @@ namespace OpenSim.world
 
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
             ControllingClient = TheClient;
+            this.firstname = ControllingClient.FirstName;
+            this.lastname = ControllingClient.LastName;
             localid = 8880000 + (this.m_world._localNumber++);
             Pos = ControllingClient.StartPos;
             visualParams = new byte[218];
@@ -67,10 +69,10 @@ namespace OpenSim.world
 
             this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
 
-            /*
+            
             //register for events
             ControllingClient.OnRequestWearables += new GenericCall(this.SendOurAppearance);
-            ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);*/
+            //ControllingClient.OnSetAppearance += new SetAppearance(this.SetAppearance);
             ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.CompleteMovement);
             ControllingClient.OnCompleteMovementToRegion += new GenericCall2(this.SendInitialPosition);
            /* ControllingClient.OnAgentUpdate += new GenericCall3(this.HandleAgentUpdate);
-- 
cgit v1.1