aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorSean Dague2008-05-19 19:08:59 +0000
committerSean Dague2008-05-19 19:08:59 +0000
commit9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9 (patch)
treec823e351a3796d145bc71aee402c18cb89b8fb25 /OpenSim/Data
parent(from awebb) (diff)
downloadopensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.zip
opensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.tar.gz
opensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.tar.bz2
opensim-SC_OLD-9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9.tar.xz
i can haz pantz?
You sure can. This change set restores pants (and the rest of the default appearance) in grid mode. The root issue had to do with serializing multi-faced textures to the grid server. This also restores the lookup path through the avatar factory module, as that seems the reasonable place to have it live. Some clean up patches are coming later as well, plus testing on standalone, but this should be in a good kicking around state for grid users.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs4
-rw-r--r--OpenSim/Data/UserDataBase.cs7
2 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index 677d287..cd5ac39 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -661,9 +661,7 @@ namespace OpenSim.Data.MySQL
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))
663 { 663 {
664 appearance = new AvatarAppearance(); 664 appearance = null;
665 appearance.Owner = user;
666 UpdateUserAppearance(user, appearance);
667 } 665 }
668 return appearance; 666 return appearance;
669 } 667 }
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs
index 50325b2..57f4564 100644
--- a/OpenSim/Data/UserDataBase.cs
+++ b/OpenSim/Data/UserDataBase.cs
@@ -60,15 +60,12 @@ namespace OpenSim.Data
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 AvatarAppearance GetUserAppearance(LLUUID user) {
63 AvatarAppearance aa; 63 AvatarAppearance aa = null;
64 try { 64 try {
65 aa = aplist[user]; 65 aa = aplist[user];
66 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString()); 66 m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString());
67 } catch (System.Collections.Generic.KeyNotFoundException e) { 67 } catch (System.Collections.Generic.KeyNotFoundException e) {
68 aplist[user] = new AvatarAppearance(); 68 m_log.Info("[APPEARANCE] No appearance found for " + user.ToString());
69 aplist[user].Owner = user;
70 aa = aplist[user];
71 m_log.Info("[APPEARANCE] Setting up default appearance for " + user.ToString() + aa.ToString());
72 } 69 }
73 return aa; 70 return aa;
74 } 71 }