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