diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 17 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs | 10 |
2 files changed, 15 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 87d0b0d..c01d66a 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
50 | //if ((profile != null) && (profile.RootFolder != null)) | 50 | //if ((profile != null) && (profile.RootFolder != null)) |
51 | if (avatar != null) | 51 | if (avatar != null) |
52 | { | 52 | { |
53 | appearance = avatar.ToAvatarAppearance(); | 53 | appearance = avatar.ToAvatarAppearance(avatarId); |
54 | return true; | 54 | return true; |
55 | } | 55 | } |
56 | 56 | ||
@@ -153,6 +153,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
153 | /// <param name="e"></param> | 153 | /// <param name="e"></param> |
154 | public void AvatarIsWearing(Object sender, AvatarWearingArgs e) | 154 | public void AvatarIsWearing(Object sender, AvatarWearingArgs e) |
155 | { | 155 | { |
156 | m_log.DebugFormat("[APPEARANCE]: AvatarIsWearing"); | ||
157 | |||
156 | IClientAPI clientView = (IClientAPI)sender; | 158 | IClientAPI clientView = (IClientAPI)sender; |
157 | ScenePresence sp = m_scene.GetScenePresence(clientView.AgentId); | 159 | ScenePresence sp = m_scene.GetScenePresence(clientView.AgentId); |
158 | 160 | ||
@@ -162,12 +164,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
162 | return; | 164 | return; |
163 | } | 165 | } |
164 | 166 | ||
165 | AvatarAppearance avatAppearance = null; | 167 | AvatarAppearance avatAppearance = sp.Appearance; |
166 | if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) | 168 | //if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) |
167 | { | 169 | //{ |
168 | m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence"); | 170 | // m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence"); |
169 | avatAppearance = sp.Appearance; | 171 | // avatAppearance = sp.Appearance; |
170 | } | 172 | //} |
171 | 173 | ||
172 | //m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name); | 174 | //m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name); |
173 | 175 | ||
@@ -194,6 +196,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
194 | 196 | ||
195 | public void UpdateDatabase(UUID user, AvatarAppearance appearance) | 197 | public void UpdateDatabase(UUID user, AvatarAppearance appearance) |
196 | { | 198 | { |
199 | m_log.DebugFormat("[APPEARANCE]: UpdateDatabase"); | ||
197 | AvatarData adata = new AvatarData(appearance); | 200 | AvatarData adata = new AvatarData(appearance); |
198 | m_scene.AvatarService.SetAvatar(user, adata); | 201 | m_scene.AvatarService.SetAvatar(user, adata); |
199 | 202 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs index 0c8ee61..47f19a3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs | |||
@@ -72,7 +72,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
72 | IConfig userConfig = source.Configs["AvatarService"]; | 72 | IConfig userConfig = source.Configs["AvatarService"]; |
73 | if (userConfig == null) | 73 | if (userConfig == null) |
74 | { | 74 | { |
75 | m_log.Error("[USER CONNECTOR]: AvatarService missing from OpenSim.ini"); | 75 | m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini"); |
76 | return; | 76 | return; |
77 | } | 77 | } |
78 | 78 | ||
@@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
81 | 81 | ||
82 | if (serviceDll == String.Empty) | 82 | if (serviceDll == String.Empty) |
83 | { | 83 | { |
84 | m_log.Error("[USER CONNECTOR]: No LocalServiceModule named in section AvatarService"); | 84 | m_log.Error("[AVATAR CONNECTOR]: No LocalServiceModule named in section AvatarService"); |
85 | return; | 85 | return; |
86 | } | 86 | } |
87 | 87 | ||
@@ -92,11 +92,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
92 | 92 | ||
93 | if (m_AvatarService == null) | 93 | if (m_AvatarService == null) |
94 | { | 94 | { |
95 | m_log.Error("[USER CONNECTOR]: Can't load user account service"); | 95 | m_log.Error("[AVATAR CONNECTOR]: Can't load user account service"); |
96 | return; | 96 | return; |
97 | } | 97 | } |
98 | m_Enabled = true; | 98 | m_Enabled = true; |
99 | m_log.Info("[USER CONNECTOR]: Local avatar connector enabled"); | 99 | m_log.Info("[AVATAR CONNECTOR]: Local avatar connector enabled"); |
100 | } | 100 | } |
101 | } | 101 | } |
102 | } | 102 | } |
@@ -118,7 +118,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar | |||
118 | if (!m_Enabled) | 118 | if (!m_Enabled) |
119 | return; | 119 | return; |
120 | 120 | ||
121 | scene.RegisterModuleInterface<IAvatarService>(m_AvatarService); | 121 | scene.RegisterModuleInterface<IAvatarService>(this); |
122 | } | 122 | } |
123 | 123 | ||
124 | public void RemoveRegion(Scene scene) | 124 | public void RemoveRegion(Scene scene) |