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/Region/Environment/Scenes/Scene.cs | 31 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes') diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index e1764b5..d02d22f 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -1780,28 +1780,27 @@ namespace OpenSim.Region.Environment.Scenes protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) { - AvatarAppearance appearance = CommsManager.UserService.GetUserAppearance(client.AgentId); + + AvatarAppearance appearance = null; + GetAvatarAppearance(client, out appearance); ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance); return avatar; } - // protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) - // { - // appearance = CommsManager.UserService.GetUserAppearance(client.AgentId); - - // // if (m_AvatarFactory == null || - // // !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) - // // { - // // //not found Appearance - // // m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); - // // byte[] visualParams; - // // AvatarWearable[] wearables; - // // GetDefaultAvatarAppearance(out wearables, out visualParams); - // // appearance = new AvatarAppearance(client.AgentId, wearables, visualParams); - // // } - // } + protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) + { + appearance = CommsManager.UserService.GetUserAppearance(client.AgentId); + + if (m_AvatarFactory == null || + !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) + { + // not found Appearance + m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); + appearance = new AvatarAppearance(); + } + } /// /// Remove the given client from the scene. -- cgit v1.1