From 5dfd2643dfc530280e5dcd0056b59add7d49f313 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Wed, 30 Sep 2009 15:53:03 -0700
Subject: * Change the signature of the agent set appearance callback to
 prevent unnecessary serialization/deserialization of TextureEntry objects and
 allow TextureEntry to be inspected for missing bakes * Inspect incoming
 TextureEntry updates for bakes that do not exist on the simulator and request
 the missing textures * Properly handle appearance updates that do not have a
 TextureEntry set

---
 .../Agent/InternetRelayClientView/Server/IRCClientView.cs         | 7 +------
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs             | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'OpenSim/Region/OptionalModules')

diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 2316267..57f5d29 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -861,12 +861,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
             Scene scene = (Scene)Scene;
             AvatarAppearance appearance;
             scene.GetAvatarAppearance(this, out appearance);
-            List<byte> visualParams = new List<byte>();
-            foreach (byte visualParam in appearance.VisualParams)
-            {
-                visualParams.Add(visualParam);
-            }
-            OnSetAppearance(appearance.Texture.GetBytes(), visualParams);
+            OnSetAppearance(appearance.Texture, (byte[])appearance.VisualParams.Clone());
         }
 
         public void SendRegionHandshake(RegionInfo regionInfo, RegionHandshakeArgs args)
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index b3bfe07..30a2675 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -163,13 +163,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                     {
                         AvatarAppearance x = GetAppearance(p_cloneAppearanceFrom, p_scene);
 
-                        List<byte> wearbyte = new List<byte>();
-                        for (int i = 0; i < x.VisualParams.Length; i++)
-                        {
-                            wearbyte.Add(x.VisualParams[i]);
-                        }
-
-                        sp.SetAppearance(x.Texture.GetBytes(), wearbyte);
+                        sp.SetAppearance(x.Texture, (byte[])x.VisualParams.Clone());
                     }
 
                     m_avatars.Add(npcAvatar.AgentId, npcAvatar);
-- 
cgit v1.1