From 9808f39b6f21c26ac0e8cf9c8a04cc8ab2bfa7e9 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 19 May 2008 19:08:59 +0000 Subject: 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. --- OpenSim/Data/MySQL/MySQLUserData.cs | 4 +--- OpenSim/Data/UserDataBase.cs | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'OpenSim/Data') 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 AvatarAppearance appearance = null; if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance)) { - appearance = new AvatarAppearance(); - appearance.Owner = user; - UpdateUserAppearance(user, appearance); + appearance = null; } return appearance; } 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 public abstract void Initialise(string connect); public abstract List GeneratePickerResults(LLUUID queryID, string query); public AvatarAppearance GetUserAppearance(LLUUID user) { - AvatarAppearance aa; + AvatarAppearance aa = null; try { aa = aplist[user]; m_log.Info("[APPEARANCE] Found appearance for " + user.ToString() + aa.ToString()); } catch (System.Collections.Generic.KeyNotFoundException e) { - aplist[user] = new AvatarAppearance(); - aplist[user].Owner = user; - aa = aplist[user]; - m_log.Info("[APPEARANCE] Setting up default appearance for " + user.ToString() + aa.ToString()); + m_log.Info("[APPEARANCE] No appearance found for " + user.ToString()); } return aa; } -- cgit v1.1