diff options
author | Diva Canto | 2010-01-11 17:30:05 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-11 17:30:05 -0800 |
commit | 77e43f480154b0a950d9d5f54df5c225fc64e77a (patch) | |
tree | 48f1806bd8b0d0f50aef89846bcc186d3ad3eb74 /OpenSim/Region/CoreModules/Avatar/AvatarFactory | |
parent | This fixes the problem that region modules (new style) weren't being recognized. (diff) | |
download | opensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.zip opensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.tar.gz opensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.tar.bz2 opensim-SC_OLD-77e43f480154b0a950d9d5f54df5c225fc64e77a.tar.xz |
Fixed a couple of bugs with Appearance. Appearance is all good now.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 17 |
1 files changed, 10 insertions, 7 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 | ||