aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2011-12-09 22:55:08 +0000
committerMelanie2011-12-09 22:55:08 +0000
commit5f6a4c4111b996cc8cea20b5d39d902db4aa4dba (patch)
treea91059a30d7997c78ac267aeb33816bfd747c6c0 /OpenSim/Region/CoreModules
parentRestore the Avination way of position and angle calculation so resizers (diff)
parentremove some unused fields in ScenePresence (diff)
downloadopensim-SC_OLD-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.zip
opensim-SC_OLD-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.gz
opensim-SC_OLD-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.bz2
opensim-SC_OLD-5f6a4c4111b996cc8cea20b5d39d902db4aa4dba.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 3881dcd..70d9f23 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -114,6 +114,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
114 return; 114 return;
115 } 115 }
116 116
117// m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0}", sp.Name);
118
117 List<AvatarAttachment> attachments = sp.Appearance.GetAttachments(); 119 List<AvatarAttachment> attachments = sp.Appearance.GetAttachments();
118 foreach (AvatarAttachment attach in attachments) 120 foreach (AvatarAttachment attach in attachments)
119 { 121 {