aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/AvatarFactory
diff options
context:
space:
mode:
authorMelanie2013-03-22 01:01:24 +0000
committerMelanie2013-03-22 01:01:24 +0000
commit68b910c1ff03d241e2aec65ebe67ffaa58babbf6 (patch)
tree7b59aed339b6d13602b0ba9d65d04b9a920abe00 /OpenSim/Region/CoreModules/Avatar/AvatarFactory
parentMerge branch 'avination' into careminster (diff)
parentImplement chat across region borders since we can tell if avatars in neighbou... (diff)
downloadopensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.zip
opensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.gz
opensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.bz2
opensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/AvatarFactory')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs12
1 files changed, 10 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 864f33e..51fe1ea 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
361 361
362 public void QueueAppearanceSave(UUID agentid) 362 public void QueueAppearanceSave(UUID agentid)
363 { 363 {
364 // m_log.WarnFormat("[AVFACTORY]: Queue appearance save for {0}", agentid); 364// m_log.DebugFormat("[AVFACTORY]: Queueing appearance save for {0}", agentid);
365 365
366 // 10000 ticks per millisecond, 1000 milliseconds per second 366 // 10000 ticks per millisecond, 1000 milliseconds per second
367 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 1000 * 10000); 367 long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 1000 * 10000);
@@ -658,7 +658,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
658 return; 658 return;
659 } 659 }
660 660
661 // m_log.WarnFormat("[AVFACTORY] avatar {0} save appearance",agentid); 661// m_log.DebugFormat("[AVFACTORY]: Saving appearance for avatar {0}", agentid);
662 662
663 // This could take awhile since it needs to pull inventory 663 // This could take awhile since it needs to pull inventory
664 // We need to do it at the point of save so that there is a sufficient delay for any upload of new body part/shape 664 // We need to do it at the point of save so that there is a sufficient delay for any upload of new body part/shape
@@ -667,6 +667,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
667 // multiple save requests. 667 // multiple save requests.
668 SetAppearanceAssets(sp.UUID, sp.Appearance); 668 SetAppearanceAssets(sp.UUID, sp.Appearance);
669 669
670// List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
671// foreach (AvatarAttachment att in attachments)
672// {
673// m_log.DebugFormat(
674// "[AVFACTORY]: For {0} saving attachment {1} at point {2}",
675// sp.Name, att.ItemID, att.AttachPoint);
676// }
677
670 m_scene.AvatarService.SetAppearance(agentid, sp.Appearance); 678 m_scene.AvatarService.SetAppearance(agentid, sp.Appearance);
671 679
672 // Trigger this here because it's the final step in the set/queue/save process for appearance setting. 680 // Trigger this here because it's the final step in the set/queue/save process for appearance setting.