aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authoropensim mirror account2010-10-29 15:50:06 -0700
committeropensim mirror account2010-10-29 15:50:06 -0700
commitf6b88d620861cc943a60e9e7ea042dff3a159267 (patch)
tree2bf4401cb2e62cfe86ce505bdcf3a846fa6af9bd
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentRationalize the logging messages from the merged appearance branch, commentin... (diff)
downloadopensim-SC_OLD-f6b88d620861cc943a60e9e7ea042dff3a159267.zip
opensim-SC_OLD-f6b88d620861cc943a60e9e7ea042dff3a159267.tar.gz
opensim-SC_OLD-f6b88d620861cc943a60e9e7ea042dff3a159267.tar.bz2
opensim-SC_OLD-f6b88d620861cc943a60e9e7ea042dff3a159267.tar.xz
Merge branch 'master' of /var/git/opensim/
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs35
-rw-r--r--OpenSim/Framework/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs47
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
4 files changed, 39 insertions, 57 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index a4bb765..9494410 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -329,9 +329,8 @@ namespace OpenSim.Framework
329 329
330 public AvatarAppearance(UUID owner) 330 public AvatarAppearance(UUID owner)
331 { 331 {
332// DEBUG ON 332// m_log.WarnFormat("[AVATAR APPEARANCE]: create empty appearance for {0}",owner);
333 m_log.WarnFormat("[AVATAR APPEARANCE] create empty appearance for {0}",owner); 333
334// DEBUG OFF
335 m_serial = 1; 334 m_serial = 1;
336 m_owner = owner; 335 m_owner = owner;
337 336
@@ -345,9 +344,8 @@ namespace OpenSim.Framework
345 344
346 public AvatarAppearance(UUID avatarID, OSDMap map) 345 public AvatarAppearance(UUID avatarID, OSDMap map)
347 { 346 {
348// DEBUG ON 347// m_log.WarnFormat("[AVATAR APPEARANCE]: create appearance for {0} from OSDMap",avatarID);
349 m_log.WarnFormat("[AVATAR APPEARANCE] create appearance for {0} from OSDMap",avatarID); 348
350// DEBUG OFF
351 m_owner = avatarID; 349 m_owner = avatarID;
352 Unpack(map); 350 Unpack(map);
353 SetHeight(); 351 SetHeight();
@@ -355,9 +353,8 @@ namespace OpenSim.Framework
355 353
356 public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams) 354 public AvatarAppearance(UUID avatarID, AvatarWearable[] wearables, Primitive.TextureEntry textureEntry, byte[] visualParams)
357 { 355 {
358// DEBUG ON 356// m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID);
359 m_log.WarnFormat("[AVATAR APPEARANCE] create initialized appearance for {0}",avatarID); 357
360// DEBUG OFF
361 m_serial = 1; 358 m_serial = 1;
362 m_owner = avatarID; 359 m_owner = avatarID;
363 360
@@ -383,9 +380,8 @@ namespace OpenSim.Framework
383 380
384 public AvatarAppearance(AvatarAppearance appearance) 381 public AvatarAppearance(AvatarAppearance appearance)
385 { 382 {
386// DEBUG ON 383// m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance");
387 m_log.WarnFormat("[AVATAR APPEARANCE] create from an existing appearance"); 384
388// DEBUG OFF
389 if (appearance == null) 385 if (appearance == null)
390 { 386 {
391 m_serial = 1; 387 m_serial = 1;
@@ -479,10 +475,9 @@ namespace OpenSim.Framework
479 } 475 }
480 476
481 changed = true; 477 changed = true;
482// DEBUG ON 478
483 if (newface != null) 479// if (newface != null)
484 m_log.WarnFormat("[AVATAR APPEARANCE] index {0}, new texture id {1}",i,newface.TextureID); 480// m_log.WarnFormat("[AVATAR APPEARANCE]: index {0}, new texture id {1}",i,newface.TextureID);
485// DEBUG OFF
486 } 481 }
487 482
488 m_texture = textureEntry; 483 m_texture = textureEntry;
@@ -742,7 +737,7 @@ namespace OpenSim.Framework
742 } 737 }
743 else 738 else
744 { 739 {
745 m_log.Warn("[AVATARAPPEARANCE] failed to unpack wearables"); 740 m_log.Warn("[AVATAR APPEARANCE]: failed to unpack wearables");
746 } 741 }
747 742
748 // Avatar Textures 743 // Avatar Textures
@@ -760,7 +755,7 @@ namespace OpenSim.Framework
760 } 755 }
761 else 756 else
762 { 757 {
763 m_log.Warn("[AVATARAPPEARANCE] failed to unpack textures"); 758 m_log.Warn("[AVATAR APPEARANCE]: failed to unpack textures");
764 } 759 }
765 760
766 // Visual Parameters 761 // Visual Parameters
@@ -772,7 +767,7 @@ namespace OpenSim.Framework
772 } 767 }
773 else 768 else
774 { 769 {
775 m_log.Warn("[AVATARAPPEARANCE] failed to unpack visual parameters"); 770 m_log.Warn("[AVATAR APPEARANCE]: failed to unpack visual parameters");
776 } 771 }
777 772
778 // Attachments 773 // Attachments
@@ -786,7 +781,7 @@ namespace OpenSim.Framework
786 } 781 }
787 catch (Exception e) 782 catch (Exception e)
788 { 783 {
789 m_log.ErrorFormat("[AVATARAPPEARANCE] unpack failed badly: {0}",e.Message); 784 m_log.ErrorFormat("[AVATAR APPEARANCE]: unpack failed badly: {0}{1}", e.Message, e.StackTrace);
790 } 785 }
791 } 786 }
792 787
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs
index 872de9a..7b0e053 100644
--- a/OpenSim/Framework/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Capabilities/Caps.cs
@@ -988,9 +988,7 @@ namespace OpenSim.Framework.Capabilities
988 988
989 public void BakedTextureUploaded(UUID assetID, byte[] data) 989 public void BakedTextureUploaded(UUID assetID, byte[] data)
990 { 990 {
991// DEBUG ON 991// m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
992 m_log.WarnFormat("[CAPS]: Received baked texture {0}", assetID.ToString());
993// DEBUG OFF
994 AssetBase asset; 992 AssetBase asset;
995 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString()); 993 asset = new AssetBase(assetID, "Baked Texture", (sbyte)AssetType.Texture, m_agentID.ToString());
996 asset.Data = data; 994 asset.Data = data;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index bfbbcf8..e2755c8 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
117 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 117 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
118 if (sp == null) 118 if (sp == null)
119 { 119 {
120 m_log.WarnFormat("[AVFACTORY] SetAppearance unable to find presence for {0}",client.AgentId); 120 m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance unable to find presence for {0}", client.AgentId);
121 return false; 121 return false;
122 } 122 }
123 123
@@ -147,14 +147,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
147 /// <param name="visualParam"></param> 147 /// <param name="visualParam"></param>
148 public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams) 148 public void SetAppearance(IClientAPI client, Primitive.TextureEntry textureEntry, byte[] visualParams)
149 { 149 {
150// DEBUG ON 150// m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance for {0}",client.AgentId);
151 m_log.WarnFormat("[AVFACTORY] SetAppearance for {0}",client.AgentId);
152// DEBUG OFF
153 151
154 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 152 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
155 if (sp == null) 153 if (sp == null)
156 { 154 {
157 m_log.WarnFormat("[AVFACTORY] SetAppearance unable to find presence for {0}",client.AgentId); 155 m_log.WarnFormat("[AVATAR FACTORY MODULE]: SetAppearance unable to find presence for {0}",client.AgentId);
158 return; 156 return;
159 } 157 }
160 158
@@ -212,8 +210,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
212 { 210 {
213 if (m_scene.AssetService.Get(textureID.ToString()) == null) 211 if (m_scene.AssetService.Get(textureID.ToString()) == null)
214 { 212 {
215 m_log.WarnFormat("[AVFACTORY]: Missing baked texture {0} ({1}) for avatar {2}", 213 m_log.WarnFormat("[AVATAR FACTORY MODULE]: Missing baked texture {0} ({1}) for avatar {2}",
216 textureID,idx,client.Name); 214 textureID, idx, client.Name);
217 return false; 215 return false;
218 } 216 }
219 return true; 217 return true;
@@ -223,9 +221,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
223 221
224 public void QueueAppearanceSend(UUID agentid) 222 public void QueueAppearanceSend(UUID agentid)
225 { 223 {
226// DEBUG ON 224// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance send for {0}",agentid);
227 m_log.WarnFormat("[AVFACTORY] Queue appearance send for {0}",agentid);
228// DEBUG OFF
229 225
230 // 100 nanoseconds (ticks) we should wait 226 // 100 nanoseconds (ticks) we should wait
231 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000); 227 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000);
@@ -238,9 +234,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
238 234
239 public void QueueAppearanceSave(UUID agentid) 235 public void QueueAppearanceSave(UUID agentid)
240 { 236 {
241// DEBUG ON 237// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance save for {0}",agentid);
242 m_log.WarnFormat("[AVFACTORY] Queue appearance save for {0}",agentid);
243// DEBUG OFF
244 238
245 // 100 nanoseconds (ticks) we should wait 239 // 100 nanoseconds (ticks) we should wait
246 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000); 240 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000);
@@ -256,13 +250,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
256 ScenePresence sp = m_scene.GetScenePresence(agentid); 250 ScenePresence sp = m_scene.GetScenePresence(agentid);
257 if (sp == null) 251 if (sp == null)
258 { 252 {
259 m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid); 253 m_log.WarnFormat("[AVATAR FACTORY MODULE]: Agent {0} no longer in the scene", agentid);
260 return; 254 return;
261 } 255 }
262 256
263// DEBUG ON 257// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Handle appearance send for {0}", agentid);
264 m_log.WarnFormat("[AVFACTORY] Handle appearance send for {0}",agentid);
265// DEBUG OFF
266 258
267 // Send the appearance to everyone in the scene 259 // Send the appearance to everyone in the scene
268 sp.SendAppearanceToAllOtherAgents(); 260 sp.SendAppearanceToAllOtherAgents();
@@ -288,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
288 ScenePresence sp = m_scene.GetScenePresence(agentid); 280 ScenePresence sp = m_scene.GetScenePresence(agentid);
289 if (sp == null) 281 if (sp == null)
290 { 282 {
291 m_log.WarnFormat("[AVFACTORY] Agent {0} no longer in the scene",agentid); 283 m_log.WarnFormat("[AVATAR FACTORY MODULE]: Agent {0} no longer in the scene", agentid);
292 return; 284 return;
293 } 285 }
294 286
@@ -339,13 +331,12 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
339 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 331 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
340 if (sp == null) 332 if (sp == null)
341 { 333 {
342 m_log.WarnFormat("[AVFACTORY] SendWearables unable to find presence for {0}",client.AgentId); 334 m_log.WarnFormat("[AVATAR FACTORY MODULE]: SendWearables unable to find presence for {0}", client.AgentId);
343 return; 335 return;
344 } 336 }
345 337
346// DEBUG ON 338// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Received request for wearables of {0}", client.AgentId);
347 m_log.WarnFormat("[AVFACTORY]: Received request for wearables of {0}", client.AgentId); 339
348// DEBUG OFF
349 client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++); 340 client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++);
350 } 341 }
351 342
@@ -359,13 +350,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
359 ScenePresence sp = m_scene.GetScenePresence(client.AgentId); 350 ScenePresence sp = m_scene.GetScenePresence(client.AgentId);
360 if (sp == null) 351 if (sp == null)
361 { 352 {
362 m_log.WarnFormat("[AVFACTORY] AvatarIsWearing unable to find presence for {0}",client.AgentId); 353 m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing unable to find presence for {0}", client.AgentId);
363 return; 354 return;
364 } 355 }
365 356
366// DEBUG ON 357// m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing called for {0}",client.AgentId);
367 m_log.WarnFormat("[AVFACTORY]: AvatarIsWearing called for {0}",client.AgentId);
368// DEBUG OFF
369 358
370 AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance); 359 AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance);
371 360
@@ -409,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
409 else 398 else
410 { 399 {
411 m_log.ErrorFormat( 400 m_log.ErrorFormat(
412 "[AVFACTORY]: Can't find inventory item {0} for {1}, setting to default", 401 "[AVATAR FACTORY MODULE]: Can't find inventory item {0} for {1}, setting to default",
413 appearance.Wearables[i].ItemID, (WearableType)i); 402 appearance.Wearables[i].ItemID, (WearableType)i);
414 403
415 appearance.Wearables[i].ItemID = UUID.Zero; 404 appearance.Wearables[i].ItemID = UUID.Zero;
@@ -420,7 +409,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
420 } 409 }
421 else 410 else
422 { 411 {
423 m_log.WarnFormat("[AVFACTORY]: user {0} has no inventory, appearance isn't going to work", userID); 412 m_log.WarnFormat("[AVATAR FACTORY MODULE]: user {0} has no inventory, appearance isn't going to work", userID);
424 } 413 }
425 } 414 }
426 } 415 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1fc3ed6..29cf0e5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2393,13 +2393,13 @@ namespace OpenSim.Region.Framework.Scenes
2393 2393
2394 if (LocalId == remoteAvatar.LocalId) 2394 if (LocalId == remoteAvatar.LocalId)
2395 { 2395 {
2396 m_log.WarnFormat("[SP] An agent is attempting to send data to itself; {0}",UUID); 2396 m_log.WarnFormat("[SCENEPRESENCE]: An agent is attempting to send data to itself; {0}", UUID);
2397 return; 2397 return;
2398 } 2398 }
2399 2399
2400 if (IsChildAgent) 2400 if (IsChildAgent)
2401 { 2401 {
2402 m_log.WarnFormat("[SCENEPRESENCE] A child agent is attempting to send out avatar data"); 2402 m_log.WarnFormat("[SCENEPRESENCE]: A child agent is attempting to send out avatar data; {0}", UUID);
2403 return; 2403 return;
2404 } 2404 }
2405 2405
@@ -2482,14 +2482,14 @@ namespace OpenSim.Region.Framework.Scenes
2482 { 2482 {
2483 if (m_scene.AvatarFactory.ValidateBakedTextureCache(m_controllingClient)) 2483 if (m_scene.AvatarFactory.ValidateBakedTextureCache(m_controllingClient))
2484 { 2484 {
2485 m_log.WarnFormat("[SP] baked textures are in the ache for {0}",Name); 2485// m_log.WarnFormat("[SCENEPRESENCE]: baked textures are in the cache for {0}", Name);
2486 m_controllingClient.SendAppearance( 2486 m_controllingClient.SendAppearance(
2487 m_appearance.Owner,m_appearance.VisualParams,m_appearance.Texture.GetBytes()); 2487 m_appearance.Owner,m_appearance.VisualParams,m_appearance.Texture.GetBytes());
2488 } 2488 }
2489 } 2489 }
2490 else 2490 else
2491 { 2491 {
2492 m_log.WarnFormat("[SP] AvatarFactory not set"); 2492 m_log.WarnFormat("[SCENEPRESENCE]: AvatarFactory not set for {0}", Name);
2493 } 2493 }
2494 2494
2495 SendInitialFullUpdateToAllClients(); 2495 SendInitialFullUpdateToAllClients();
@@ -2501,7 +2501,7 @@ namespace OpenSim.Region.Framework.Scenes
2501 public void SendAppearanceToAllOtherAgents() 2501 public void SendAppearanceToAllOtherAgents()
2502 { 2502 {
2503// DEBUG ON 2503// DEBUG ON
2504 m_log.WarnFormat("[SP] Send appearance from {0} to all other agents",m_uuid); 2504// m_log.WarnFormat("[SCENEPRESENCE]: Send appearance from {0} to all other agents", m_uuid);
2505// DEBUG OFF 2505// DEBUG OFF
2506 m_perfMonMS = Util.EnvironmentTickCount(); 2506 m_perfMonMS = Util.EnvironmentTickCount();
2507 2507