aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs33
1 files changed, 16 insertions, 17 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index bc80915..a798f40 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1779,29 +1779,28 @@ namespace OpenSim.Region.Environment.Scenes
1779 1779
1780 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child) 1780 protected virtual ScenePresence CreateAndAddScenePresence(IClientAPI client, bool child)
1781 { 1781 {
1782 AvatarAppearance appearance; 1782 AvatarAppearance appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
1783 GetAvatarAppearance(client, out appearance);
1784 1783
1785 ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance); 1784 ScenePresence avatar = m_innerScene.CreateAndAddScenePresence(client, child, appearance);
1786 1785
1787 return avatar; 1786 return avatar;
1788 } 1787 }
1789 1788
1790 protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance) 1789 // protected void GetAvatarAppearance(IClientAPI client, out AvatarAppearance appearance)
1791 { 1790 // {
1792 appearance = CommsManager.UserService.GetUserAppearance(client.AgentId); 1791 // appearance = CommsManager.UserService.GetUserAppearance(client.AgentId);
1793 1792
1794 // if (m_AvatarFactory == null || 1793 // // if (m_AvatarFactory == null ||
1795 // !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance)) 1794 // // !m_AvatarFactory.TryGetAvatarAppearance(client.AgentId, out appearance))
1796 // { 1795 // // {
1797 // //not found Appearance 1796 // // //not found Appearance
1798 // m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis"); 1797 // // m_log.Warn("[AVATAR DEBUGGING]: Couldn't fetch avatar appearance from factory, please report this to the opensim mantis");
1799 // byte[] visualParams; 1798 // // byte[] visualParams;
1800 // AvatarWearable[] wearables; 1799 // // AvatarWearable[] wearables;
1801 // GetDefaultAvatarAppearance(out wearables, out visualParams); 1800 // // GetDefaultAvatarAppearance(out wearables, out visualParams);
1802 // appearance = new AvatarAppearance(client.AgentId, wearables, visualParams); 1801 // // appearance = new AvatarAppearance(client.AgentId, wearables, visualParams);
1803 // } 1802 // // }
1804 } 1803 // }
1805 1804
1806 /// <summary> 1805 /// <summary>
1807 /// Remove the given client from the scene. 1806 /// Remove the given client from the scene.