OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make the super class conveniance appearance stuff virtual 

so they can be overrided correctly by subclasses
0.6.0-stable
Sean Dague 2008-05-19 20:49:57 +00:00
parent 7a52b35c57
commit d1c4fc94e7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -656,7 +656,7 @@ namespace OpenSim.Data.MySQL
/// Appearance /// Appearance
/// TODO: stubs for now to get us to a compiling state gently /// TODO: stubs for now to get us to a compiling state gently
// override // override
public AvatarAppearance GetUserAppearance(LLUUID user) override public AvatarAppearance GetUserAppearance(LLUUID user)
{ {
AvatarAppearance appearance = null; AvatarAppearance appearance = null;
if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance)) if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance))
@ -667,7 +667,7 @@ namespace OpenSim.Data.MySQL
} }
// override // override
public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
{ {
m_appearanceMapper.Update(user.UUID, appearance); m_appearanceMapper.Update(user.UUID, appearance);
} }

4
OpenSim/Data/UserDataBase.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Data
public abstract string Name {get;} public abstract string Name {get;}
public abstract void Initialise(string connect); public abstract void Initialise(string connect);
public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
public AvatarAppearance GetUserAppearance(LLUUID user) { public virtual AvatarAppearance GetUserAppearance(LLUUID user) {
AvatarAppearance aa = null; AvatarAppearance aa = null;
try { try {
aa = aplist[user]; aa = aplist[user];
@ -69,7 +69,7 @@ namespace OpenSim.Data
} }
return aa; return aa;
} }
public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) { public virtual void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) {
aplist[user] = appearance; aplist[user] = appearance;
m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString()); m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString());
} }