From 4ff4475d02a26805749897bc62feddcc21b1c5da Mon Sep 17 00:00:00 2001
From: Sean Dague
Date: Thu, 15 May 2008 18:42:27 +0000
Subject: remove my UserAppearance object, switch all code to use
 AvatarAppearance instead.

---
 OpenSim/Data/MSSQL/MSSQLUserData.cs           |  6 +++---
 OpenSim/Data/MySQL/MySQLUserData.cs           |  6 +++---
 OpenSim/Data/NHibernate/NHibernateUserData.cs | 12 ++++++------
 OpenSim/Data/SQLite/SQLiteUserData.cs         |  6 +++---
 OpenSim/Data/UserDataBase.cs                  |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Data')

diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs
index d54af82..4904bfe 100644
--- a/OpenSim/Data/MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs
@@ -747,12 +747,12 @@ namespace OpenSim.Data.MSSQL
 
         /// Appearance
         /// TODO: stubs for now to get us to a compiling state gently
-        override public UserAppearance GetUserAppearance(LLUUID user) 
+        override public AvatarAppearance GetUserAppearance(LLUUID user) 
         {
-            return new UserAppearance();
+            return new AvatarAppearance();
         }
 
-        override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
+        override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
         {
             return;
         }
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index ab34f15..622a618 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -630,12 +630,12 @@ namespace OpenSim.Data.MySQL
 
         /// Appearance
         /// TODO: stubs for now to get us to a compiling state gently
-        override public UserAppearance GetUserAppearance(LLUUID user) 
+        override public AvatarAppearance GetUserAppearance(LLUUID user) 
         {
-            return new UserAppearance();
+            return new AvatarAppearance();
         }
 
-        override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
+        override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
         {
             return;
         }
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 43d8c32..81af4d4 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -306,29 +306,29 @@ namespace OpenSim.Data.NHibernate
 
         /// Appearance
         /// TODO: stubs for now to get us to a compiling state gently
-        override public UserAppearance GetUserAppearance(LLUUID user) 
+        override public AvatarAppearance GetUserAppearance(LLUUID user) 
         {
-            UserAppearance appearance;
+            AvatarAppearance appearance;
             // TODO: I'm sure I'll have to do something silly here
             using (ISession session = factory.OpenSession())
             {
-                appearance = session.Load(typeof(UserAppearance), user) as UserAppearance;
+                appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance;
             }
             return appearance;
         }
 
         private bool ExistsAppearance(LLUUID uuid)
         {
-            UserAppearance appearance;
+            AvatarAppearance appearance;
             using (ISession session = factory.OpenSession())
             {
-                appearance = session.Load(typeof(UserAppearance), uuid) as UserAppearance;
+                appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance;
             }
             return (appearance == null) ? false : true;
         }
 
 
-        override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
+        override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
         {
             bool exists = ExistsAppearance(user);
             using (ISession session = factory.OpenSession())
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs
index aa7a849..e80a0a9 100644
--- a/OpenSim/Data/SQLite/SQLiteUserData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserData.cs
@@ -480,12 +480,12 @@ namespace OpenSim.Data.SQLite
 
         /// Appearance
         /// TODO: stubs for now to get us to a compiling state gently
-        override public UserAppearance GetUserAppearance(LLUUID user) 
+        override public AvatarAppearance GetUserAppearance(LLUUID user) 
         {
-            return new UserAppearance();
+            return new AvatarAppearance();
         }
 
-        override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance)
+        override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
         {
             return;
         }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 2ddeccf..fb784dc 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Data
         public abstract string Name {get;}
         public abstract void Initialise(string connect);
         public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
-        public abstract UserAppearance GetUserAppearance(LLUUID user);
-        public abstract void UpdateUserAppearance(LLUUID user, UserAppearance appearance);
+        public abstract AvatarAppearance GetUserAppearance(LLUUID user);
+        public abstract void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance);
         public abstract void AddAttachment(LLUUID user, LLUUID item);
         public abstract void RemoveAttachment(LLUUID user, LLUUID item);
         public abstract List<LLUUID> GetAttachments(LLUUID user);
-- 
cgit v1.1