ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

i can haz pantz?

Browse Source 
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.
This commit is contained in:
Sean Dague
2008-05-19 19:08:59 +00:00
parent 4b622ec881
commit 9808f39b6f
6 changed files with 125 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -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);
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);
// // }
// }
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();
}
}
/// <summary>
/// Remove the given client from the scene.