From 06b1535ec5054068e65a085fabd25680d145594c Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Sat, 17 May 2008 12:45:43 +0000
Subject: while this doesn't fix the initial no pants issue in grid (which
 still baffles me) it does make setting appearance in grid stick.

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 33 +++++++++++++++---------------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bc80915..a798f40 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1779,29 +1779,28 @@ namespace OpenSim.Region.Environment.Scenes
 
         protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
         {
-            AvatarAppearance appearance;
-            GetAvatarAppearance(client, out appearance);
+            AvatarAppearance appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
 
             ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance);
 
             return avatar;
         }
 
-        protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance)
-        {
-            appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
-
-            // if (m_AvatarFactory == null ||
-            //     !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
-            // {
-            //     //not found Appearance
-            //     m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis");
-            //     byte[] visualParams;
-            //     AvatarWearable[] wearables;
-            //     GetDefaultAvatarAppearance(out wearables, out visualParams);
-            //     appearance = new AvatarAppearance(client.AgentId, wearables, visualParams);
-            // }
-        }
+        // protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance)
+        // {
+        //     appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
+
+        //     // if (m_AvatarFactory == null ||
+        //     //     !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
+        //     // {
+        //     //     //not found Appearance
+        //     //     m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis");
+        //     //     byte[] visualParams;
+        //     //     AvatarWearable[] wearables;
+        //     //     GetDefaultAvatarAppearance(out wearables, out visualParams);
+        //     //     appearance = new AvatarAppearance(client.AgentId, wearables, visualParams);
+        //     // }
+        // }
 
         /// <summary>
         /// Remove the given client from the scene.
-- 
cgit v1.1