From 77e43f480154b0a950d9d5f54df5c225fc64e77a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 11 Jan 2010 17:30:05 -0800
Subject: Fixed a couple of bugs with Appearance. Appearance is all good now.

---
 OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs    | 4 ++--
 OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/ApplicationPlugins')

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index d9458af..457177d 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1397,7 +1397,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
             AvatarAppearance ava = null;
             AvatarData avatar = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(srca);
             if (avatar != null)
-                ava = avatar.ToAvatarAppearance();
+                ava = avatar.ToAvatarAppearance(srca);
 
             // If the model has no associated appearance we're done.
 
@@ -1639,7 +1639,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                             // While the inventory is being fetched, setup for appearance processing
                             AvatarData adata = m_app.SceneManager.CurrentOrFirstScene.AvatarService.GetAvatar(ID);
                             if (adata != null)
-                                mava = adata.ToAvatarAppearance();
+                                mava = adata.ToAvatarAppearance(ID);
                             else
                                 mava = new AvatarAppearance();
 
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 5429890..b70a511 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -304,7 +304,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
                     String.Format("appearance data not found for user {0} {1}", 
                       rdata.userProfile.FirstName, rdata.userProfile.SurName));
             }
-            rdata.userAppearance = adata.ToAvatarAppearance();
+            rdata.userAppearance = adata.ToAvatarAppearance(rdata.userProfile.ID);
 
             rdata.initXmlWriter();
 
@@ -446,7 +446,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
 
             if (adata != null)
             {
-                AvatarAppearance old = adata.ToAvatarAppearance();
+                AvatarAppearance old = adata.ToAvatarAppearance(rdata.userProfile.ID);
                 rdata.userAppearance = new AvatarAppearance();
                 rdata.userAppearance.Owner = old.Owner;
                 adata = new AvatarData(rdata.userAppearance);
-- 
cgit v1.1