From 7cc906213795fbe4878c0cfb8351272e847617e9 Mon Sep 17 00:00:00 2001
From: diva
Date: Tue, 17 Feb 2009 00:35:52 +0000
Subject: Major change to how appearance is managed, including changes in login
 and user service/server. Appearance is now sent by the user service/server
 along with all other loginparams. Regions don't query the user service for
 appearance anymore. The appearance is passed along from region to region as
 the avie moves around. And, as before, it's stored back with the user service
 as the client changes the avie's appearance. Child agents have default
 appearances that are set to the actual appearance when the avie moves to that
 region. (as before, child agents are invisible and non-physical).

---
 OpenSim/Framework/AgentCircuitData.cs    | 1 +
 OpenSim/Framework/AgentCircuitManager.cs | 7 +++++++
 OpenSim/Framework/AvatarAppearance.cs    | 2 +-
 OpenSim/Framework/Login.cs               | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index 1c37601..bcd4c09 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -35,6 +35,7 @@ namespace OpenSim.Framework
     public class AgentCircuitData
     {
         public UUID AgentID;
+        public AvatarAppearance Appearance;
         public UUID BaseFolder;
         public string CapsPath = String.Empty;
         public Dictionary<ulong, string> ChildrenCapSeeds;
diff --git a/OpenSim/Framework/AgentCircuitManager.cs b/OpenSim/Framework/AgentCircuitManager.cs
index 56b40bd..cf333af 100644
--- a/OpenSim/Framework/AgentCircuitManager.cs
+++ b/OpenSim/Framework/AgentCircuitManager.cs
@@ -103,6 +103,13 @@ namespace OpenSim.Framework
             }
         }
 
+        public AgentCircuitData GetAgentCircuitData(uint circuitCode)
+        {
+            AgentCircuitData agentCircuit = null;
+            AgentCircuits.TryGetValue(circuitCode, out agentCircuit);
+            return agentCircuit;
+        }
+
         public void UpdateAgentData(AgentCircuitData agentData)
         {
             if (AgentCircuits.ContainsKey((uint) agentData.circuitcode))
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index ad95f78..52041bb 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -286,7 +286,7 @@ namespace OpenSim.Framework
                            + 0.07f * (float)m_visualparams[78] / 255.0f    // Shoe platform height
                            + 0.3836f * (float)m_visualparams[125] / 255.0f    // Leg length
                            - m_avatarHeight / 2) * 0.3f - 0.04f;
-            //System.Console.WriteLine("Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
+            //System.Console.WriteLine("[APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
         }
 
         public virtual void SetWearable(int wearableId, AvatarWearable wearable)
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index 61fffd2..5913c4b 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.cs
@@ -42,6 +42,7 @@ namespace OpenSim.Framework
         public UUID SecureSession = UUID.Zero;
         public UUID Session;
         public Vector3 StartPos;
+        public AvatarAppearance Appearance;
 
         public Login()
         {
-- 
cgit v1.1