From b6ac1c46cd473b129b70344f0001f1e8f97d8860 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 2 Aug 2011 00:13:04 +0100
Subject: Get rid of AvatarAppearance.Owner to simplify the code.

This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned.
---
 OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs          | 2 +-
 .../Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services/Connectors')

diff --git a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
index 1a93ae7..8fdb4d0 100644
--- a/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Avatar/AvatarServiceConnector.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Connectors
         public AvatarAppearance GetAppearance(UUID userID)
         {
             AvatarData avatar = GetAvatar(userID);
-            return avatar.ToAvatarAppearance(userID);
+            return avatar.ToAvatarAppearance();
         }
         
         public bool SetAppearance(UUID userID, AvatarAppearance appearance)
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index 810399c..360f0dd 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -213,7 +213,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     wearables[11] = new AvatarWearable(map["UnderpantsItem"].AsUUID(), map["UnderpantsAsset"].AsUUID());
                     wearables[12] = new AvatarWearable(map["SkirtItem"].AsUUID(), map["SkirtAsset"].AsUUID());
 
-                    AvatarAppearance appearance = new AvatarAppearance(userID);
+                    AvatarAppearance appearance = new AvatarAppearance();
                     appearance.Wearables = wearables;
                     appearance.AvatarHeight = (float)map["Height"].AsReal();
 
@@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             if (avatar.AvatarType == 1) // LLAvatar
             {
-                AvatarAppearance appearance = avatar.ToAvatarAppearance(userID);
+                AvatarAppearance appearance = avatar.ToAvatarAppearance();
 
                 OSDMap map = new OSDMap();
 
-- 
cgit v1.1