From 0c509ecdde73c7216d717da4fc4d32cb3b9d35c8 Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 15 May 2008 15:10:13 +0000
Subject: minor refactor of some properties for readability

---
 OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs | 10 +++++-----
 OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'OpenSim/Region/Modules')

diff --git a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
index 2d9f32f..5fb6867 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AppearanceTableMapper.cs
@@ -50,12 +50,12 @@ namespace OpenSim.Region.Modules.AvatarFactory
             m_schema = rowMapperSchema;
 
             m_keyFieldMapper = rowMapperSchema.AddMapping<Guid>("UUID",
-       delegate(AppearanceRowMapper mapper) { return mapper.Object.ScenePresenceID.UUID; },
-       delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.ScenePresenceID = new LLUUID(value.ToString()); });
+       delegate(AppearanceRowMapper mapper) { return mapper.Object.Owner.UUID; },
+       delegate(AppearanceRowMapper mapper, Guid value) { mapper.Object.Owner = new LLUUID(value.ToString()); });
 
             rowMapperSchema.AddMapping<uint>("Serial",
-                  delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.WearablesSerial; },
-       delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.WearablesSerial = (int)value; });
+                  delegate(AppearanceRowMapper mapper) { return (uint)mapper.Object.Serial; },
+       delegate(AppearanceRowMapper mapper, uint value) { mapper.Object.Serial = (int)value; });
 
             rowMapperSchema.AddMapping<Guid>("WearableItem0",
                  delegate(AppearanceRowMapper mapper) { return mapper.Object.Wearables[0].ItemID.UUID; },
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
         public bool Update(Guid userID, AvatarAppearance appearance)
         {
             AppearanceRowMapper mapper = CreateRowMapper(appearance);
-            return Update(appearance.ScenePresenceID.UUID, mapper);
+            return Update(appearance.Owner.UUID, mapper);
         }
 
         protected AppearanceRowMapper CreateRowMapper(AvatarAppearance appearance)
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index a2ccc37..a1abe8b 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -182,7 +182,7 @@ namespace OpenSim.Region.Modules.AvatarFactory
                 if (m_appearanceMapper.TryGetValue(avatarId.UUID, out appearance))
                 {
                     appearance.VisualParams = GetDefaultVisualParams();
-                    appearance.TextureEntry = AvatarAppearance.GetDefaultTextureEntry();
+                    appearance.Texture = AvatarAppearance.GetDefaultTexture();
                     lock (m_avatarsAppearance)
                     {
                         m_avatarsAppearance[avatarId] = appearance;
-- 
cgit v1.1