aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-04 19:51:35 +0000
committerJustin Clarke Casey2008-11-04 19:51:35 +0000
commit78bfe7a3e35a3b0a316298bba2b5c57466620475 (patch)
tree2ca0762e4c52781f6f0f409a31c0c2ab11400c44 /OpenSim/Region/Environment
parentadd some null protection on email (diff)
downloadopensim-SC-78bfe7a3e35a3b0a316298bba2b5c57466620475.zip
opensim-SC-78bfe7a3e35a3b0a316298bba2b5c57466620475.tar.gz
opensim-SC-78bfe7a3e35a3b0a316298bba2b5c57466620475.tar.bz2
opensim-SC-78bfe7a3e35a3b0a316298bba2b5c57466620475.tar.xz
* minor: doc and log message tweaking for wearables
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs19
1 files changed, 15 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 94c27a5..7dc613e 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -151,6 +151,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
151 } 151 }
152 } 152 }
153 153
154 /// <summary>
155 /// Update what the avatar is wearing using an item from their inventory.
156 /// </summary>
157 /// <param name="sender"></param>
158 /// <param name="e"></param>
154 public void AvatarIsWearing(Object sender, AvatarWearingArgs e) 159 public void AvatarIsWearing(Object sender, AvatarWearingArgs e)
155 { 160 {
156 IClientAPI clientView = (IClientAPI)sender; 161 IClientAPI clientView = (IClientAPI)sender;
@@ -158,7 +163,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
158 163
159 if (avatar == null) 164 if (avatar == null)
160 { 165 {
161 m_log.Warn("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event"); 166 m_log.Error("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event");
162 return; 167 return;
163 } 168 }
164 169
@@ -167,11 +172,11 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
167 AvatarAppearance avatAppearance = null; 172 AvatarAppearance avatAppearance = null;
168 if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) 173 if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
169 { 174 {
170 m_log.Info("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresense"); 175 m_log.Info("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
171 avatAppearance = avatar.Appearance; 176 avatAppearance = avatar.Appearance;
172 } 177 }
173 178
174 m_log.Info("[APPEARANCE]: Calling Avatar is Wearing"); 179 m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
175 180
176 if (profile != null) 181 if (profile != null)
177 { 182 {
@@ -192,9 +197,15 @@ namespace OpenSim.Region.Environment.Modules.Avatar.AvatarFactory
192 } 197 }
193 else 198 else
194 { 199 {
195 m_log.Error("[APPEARANCE]: Root Profile is null, we can't set the appearance"); 200 m_log.WarnFormat(
201 "[APPEARANCE]: Inventory has not yet been received for {0}, cannot set wearables",
202 clientView.Name);
196 } 203 }
197 } 204 }
205 else
206 {
207 m_log.WarnFormat("[APPEARANCE]: Cannot set wearables for {0}, no user profile found", clientView.Name);
208 }
198 } 209 }
199 210
200 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams) 211 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)