diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 51f2942..1964ef4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
| @@ -1797,16 +1797,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1797 | 1797 | ||
| 1798 | protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) | 1798 | protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) |
| 1799 | { | 1799 | { |
| 1800 | if (m_AvatarFactory == null || | 1800 | appearance = CommsManager.UserService.GetUserAppearance(client.AgentId); |
| 1801 | !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) | 1801 | |
| 1802 | { | 1802 | // if (m_AvatarFactory == null || |
| 1803 | //not found Appearance | 1803 | // !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) |
| 1804 | m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); | 1804 | // { |
| 1805 | byte[] visualParams; | 1805 | // //not found Appearance |
| 1806 | AvatarWearable[] wearables; | 1806 | // m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); |
| 1807 | GetDefaultAvatarAppearance(out wearables, out visualParams); | 1807 | // byte[] visualParams; |
| 1808 | appearance = new AvatarAppearance(client.AgentId, wearables, visualParams); | 1808 | // AvatarWearable[] wearables; |
| 1809 | } | 1809 | // GetDefaultAvatarAppearance(out wearables, out visualParams); |
| 1810 | // appearance = new AvatarAppearance(client.AgentId, wearables, visualParams); | ||
| 1811 | // } | ||
| 1810 | } | 1812 | } |
| 1811 | 1813 | ||
| 1812 | /// <summary> | 1814 | /// <summary> |