diff options
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/NHibernate/NHibernateUserData.cs | 12 | ||||
-rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserData.cs | 6 | ||||
-rw-r--r-- | OpenSim/Data/UserDataBase.cs | 4 |
5 files changed, 17 insertions, 17 deletions
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 | |||
747 | 747 | ||
748 | /// Appearance | 748 | /// Appearance |
749 | /// TODO: stubs for now to get us to a compiling state gently | 749 | /// TODO: stubs for now to get us to a compiling state gently |
750 | override public UserAppearance GetUserAppearance(LLUUID user) | 750 | override public AvatarAppearance GetUserAppearance(LLUUID user) |
751 | { | 751 | { |
752 | return new UserAppearance(); | 752 | return new AvatarAppearance(); |
753 | } | 753 | } |
754 | 754 | ||
755 | override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) | 755 | override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) |
756 | { | 756 | { |
757 | return; | 757 | return; |
758 | } | 758 | } |
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 | |||
630 | 630 | ||
631 | /// Appearance | 631 | /// Appearance |
632 | /// TODO: stubs for now to get us to a compiling state gently | 632 | /// TODO: stubs for now to get us to a compiling state gently |
633 | override public UserAppearance GetUserAppearance(LLUUID user) | 633 | override public AvatarAppearance GetUserAppearance(LLUUID user) |
634 | { | 634 | { |
635 | return new UserAppearance(); | 635 | return new AvatarAppearance(); |
636 | } | 636 | } |
637 | 637 | ||
638 | override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) | 638 | override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) |
639 | { | 639 | { |
640 | return; | 640 | return; |
641 | } | 641 | } |
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 | |||
306 | 306 | ||
307 | /// Appearance | 307 | /// Appearance |
308 | /// TODO: stubs for now to get us to a compiling state gently | 308 | /// TODO: stubs for now to get us to a compiling state gently |
309 | override public UserAppearance GetUserAppearance(LLUUID user) | 309 | override public AvatarAppearance GetUserAppearance(LLUUID user) |
310 | { | 310 | { |
311 | UserAppearance appearance; | 311 | AvatarAppearance appearance; |
312 | // TODO: I'm sure I'll have to do something silly here | 312 | // TODO: I'm sure I'll have to do something silly here |
313 | using (ISession session = factory.OpenSession()) | 313 | using (ISession session = factory.OpenSession()) |
314 | { | 314 | { |
315 | appearance = session.Load(typeof(UserAppearance), user) as UserAppearance; | 315 | appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance; |
316 | } | 316 | } |
317 | return appearance; | 317 | return appearance; |
318 | } | 318 | } |
319 | 319 | ||
320 | private bool ExistsAppearance(LLUUID uuid) | 320 | private bool ExistsAppearance(LLUUID uuid) |
321 | { | 321 | { |
322 | UserAppearance appearance; | 322 | AvatarAppearance appearance; |
323 | using (ISession session = factory.OpenSession()) | 323 | using (ISession session = factory.OpenSession()) |
324 | { | 324 | { |
325 | appearance = session.Load(typeof(UserAppearance), uuid) as UserAppearance; | 325 | appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance; |
326 | } | 326 | } |
327 | return (appearance == null) ? false : true; | 327 | return (appearance == null) ? false : true; |
328 | } | 328 | } |
329 | 329 | ||
330 | 330 | ||
331 | override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) | 331 | override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) |
332 | { | 332 | { |
333 | bool exists = ExistsAppearance(user); | 333 | bool exists = ExistsAppearance(user); |
334 | using (ISession session = factory.OpenSession()) | 334 | 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 | |||
480 | 480 | ||
481 | /// Appearance | 481 | /// Appearance |
482 | /// TODO: stubs for now to get us to a compiling state gently | 482 | /// TODO: stubs for now to get us to a compiling state gently |
483 | override public UserAppearance GetUserAppearance(LLUUID user) | 483 | override public AvatarAppearance GetUserAppearance(LLUUID user) |
484 | { | 484 | { |
485 | return new UserAppearance(); | 485 | return new AvatarAppearance(); |
486 | } | 486 | } |
487 | 487 | ||
488 | override public void UpdateUserAppearance(LLUUID user, UserAppearance appearance) | 488 | override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) |
489 | { | 489 | { |
490 | return; | 490 | return; |
491 | } | 491 | } |
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 | |||
53 | public abstract string Name {get;} | 53 | public abstract string Name {get;} |
54 | public abstract void Initialise(string connect); | 54 | public abstract void Initialise(string connect); |
55 | public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); | 55 | public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); |
56 | public abstract UserAppearance GetUserAppearance(LLUUID user); | 56 | public abstract AvatarAppearance GetUserAppearance(LLUUID user); |
57 | public abstract void UpdateUserAppearance(LLUUID user, UserAppearance appearance); | 57 | public abstract void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance); |
58 | public abstract void AddAttachment(LLUUID user, LLUUID item); | 58 | public abstract void AddAttachment(LLUUID user, LLUUID item); |
59 | public abstract void RemoveAttachment(LLUUID user, LLUUID item); | 59 | public abstract void RemoveAttachment(LLUUID user, LLUUID item); |
60 | public abstract List<LLUUID> GetAttachments(LLUUID user); | 60 | public abstract List<LLUUID> GetAttachments(LLUUID user); |