aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs1
-rw-r--r--OpenSim/Framework/AgentCircuitManager.cs7
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs2
-rw-r--r--OpenSim/Framework/Login.cs1
4 files changed, 10 insertions, 1 deletions
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
35 public class AgentCircuitData 35 public class AgentCircuitData
36 { 36 {
37 public UUID AgentID; 37 public UUID AgentID;
38 public AvatarAppearance Appearance;
38 public UUID BaseFolder; 39 public UUID BaseFolder;
39 public string CapsPath = String.Empty; 40 public string CapsPath = String.Empty;
40 public Dictionary<ulong, string> ChildrenCapSeeds; 41 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
103 } 103 }
104 } 104 }
105 105
106 public AgentCircuitData GetAgentCircuitData(uint circuitCode)
107 {
108 AgentCircuitData agentCircuit = null;
109 AgentCircuits.TryGetValue(circuitCode, out agentCircuit);
110 return agentCircuit;
111 }
112
106 public void UpdateAgentData(AgentCircuitData agentData) 113 public void UpdateAgentData(AgentCircuitData agentData)
107 { 114 {
108 if (AgentCircuits.ContainsKey((uint) agentData.circuitcode)) 115 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
286 + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height 286 + 0.07f * (float)m_visualparams[78] / 255.0f // Shoe platform height
287 + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length 287 + 0.3836f * (float)m_visualparams[125] / 255.0f // Leg length
288 - m_avatarHeight / 2) * 0.3f - 0.04f; 288 - m_avatarHeight / 2) * 0.3f - 0.04f;
289 //System.Console.WriteLine("Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset); 289 //System.Console.WriteLine("[APPEARANCE]: Height {0} Hip offset {1}", m_avatarHeight, m_hipOffset);
290 } 290 }
291 291
292 public virtual void SetWearable(int wearableId, AvatarWearable wearable) 292 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
42 public UUID SecureSession = UUID.Zero; 42 public UUID SecureSession = UUID.Zero;
43 public UUID Session; 43 public UUID Session;
44 public Vector3 StartPos; 44 public Vector3 StartPos;
45 public AvatarAppearance Appearance;
45 46
46 public Login() 47 public Login()
47 { 48 {