From 1c49752a44e3ee251cf1422072088e27d0cc8408 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 22 May 2008 20:07:31 +0000
Subject: don't trust appearance assetid, instead do an inventory lookup any
 time we get it from the server.  This should preventent unwearable
 appearance.

---
 OpenSim/Region/Environment/Scenes/Scene.cs         |  3 +--
 OpenSim/Region/Environment/Scenes/ScenePresence.cs | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 231c0dc..729fd9a 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1801,8 +1801,7 @@ namespace OpenSim.Region.Environment.Scenes
                 !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");
-                appearance = new AvatarAppearance();
+                m_log.Warn("[APPEARANCE]: Appearance not found, creating default");
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 1aa800a..0dbd6dd 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1466,11 +1466,11 @@ namespace OpenSim.Region.Environment.Scenes
         {
             m_log.Info("[APPEARANCE] Sending Own Appearance");
             ControllingClient.SendWearables(m_appearance.Wearables, m_appearance.Serial++);
-            ControllingClient.SendAppearance(
-                                            m_appearance.Owner,
-                                            m_appearance.VisualParams,
-                                            m_appearance.Texture.ToBytes()
-                                            );
+            // ControllingClient.SendAppearance(
+            //                                 m_appearance.Owner,
+            //                                 m_appearance.VisualParams,
+            //                                 m_appearance.Texture.ToBytes()
+            // );
         }
 
         /// <summary>
-- 
cgit v1.1