aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSean Dague2008-05-19 20:49:57 +0000
committerSean Dague2008-05-19 20:49:57 +0000
commitd1c4fc94e7cdec807558dd692c249c90519d1af1 (patch)
tree5219bd3438410a9ff81773b47018b0ce7055b594
parentfix crash in standalone mode for initial appearance setup (diff)
downloadopensim-SC_OLD-d1c4fc94e7cdec807558dd692c249c90519d1af1.zip
opensim-SC_OLD-d1c4fc94e7cdec807558dd692c249c90519d1af1.tar.gz
opensim-SC_OLD-d1c4fc94e7cdec807558dd692c249c90519d1af1.tar.bz2
opensim-SC_OLD-d1c4fc94e7cdec807558dd692c249c90519d1af1.tar.xz
make the super class conveniance appearance stuff virtual
so they can be overrided correctly by subclasses
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs4
-rw-r--r--OpenSim/Data/UserDataBase.cs4
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index cd5ac39..f7d5659 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -656,7 +656,7 @@ namespace OpenSim.Data.MySQL
656 /// Appearance 656 /// Appearance
657 /// TODO: stubs for now to get us to a compiling state gently 657 /// TODO: stubs for now to get us to a compiling state gently
658 // override 658 // override
659 public AvatarAppearance GetUserAppearance(LLUUID user) 659 override public AvatarAppearance GetUserAppearance(LLUUID user)
660 { 660 {
661 AvatarAppearance appearance = null; 661 AvatarAppearance appearance = null;
662 if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance)) 662 if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance))
@@ -667,7 +667,7 @@ namespace OpenSim.Data.MySQL
667 } 667 }
668 668
669 // override 669 // override
670 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) 670 override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
671 { 671 {
672 m_appearanceMapper.Update(user.UUID, appearance); 672 m_appearanceMapper.Update(user.UUID, appearance);
673 } 673 }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 57f4564..ad40bbc 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Data
59 public abstract string Name {get;} 59 public abstract string Name {get;}
60 public abstract void Initialise(string connect); 60 public abstract void Initialise(string connect);
61 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query); 61 public abstract List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query);
62 public AvatarAppearance GetUserAppearance(LLUUID user) { 62 public virtual AvatarAppearance GetUserAppearance(LLUUID user) {
63 AvatarAppearance aa = null; 63 AvatarAppearance aa = null;
64 try { 64 try {
65 aa = aplist[user]; 65 aa = aplist[user];
@@ -69,7 +69,7 @@ namespace OpenSim.Data
69 } 69 }
70 return aa; 70 return aa;
71 } 71 }
72 public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) { 72 public virtual void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) {
73 aplist[user] = appearance; 73 aplist[user] = appearance;
74 m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString()); 74 m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString());
75 } 75 }