mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 17:55:48 +08:00
remove my UserAppearance object, switch all code to use
AvatarAppearance instead.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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())
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user