diff options
Diffstat (limited to '')
3 files changed, 8 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 5604f49..a3712d1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -218,14 +218,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
218 | 218 | ||
219 | public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | 219 | public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt) |
220 | { | 220 | { |
221 | m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing single attachment from item {0} for {1}", itemID, remoteClient.Name); | ||
222 | |||
223 | return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true); | 221 | return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true); |
224 | } | 222 | } |
225 | 223 | ||
226 | public UUID RezSingleAttachmentFromInventory( | 224 | public UUID RezSingleAttachmentFromInventory( |
227 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus) | 225 | IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus) |
228 | { | 226 | { |
227 | m_log.DebugFormat( | ||
228 | "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}", | ||
229 | (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name); | ||
230 | |||
229 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); | 231 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); |
230 | 232 | ||
231 | if (updateInventoryStatus) | 233 | if (updateInventoryStatus) |
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 7e5a8ec..22c8937 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -198,7 +198,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
198 | 198 | ||
199 | public void UpdateDatabase(UUID user, AvatarAppearance appearance) | 199 | public void UpdateDatabase(UUID user, AvatarAppearance appearance) |
200 | { | 200 | { |
201 | m_log.DebugFormat("[APPEARANCE]: UpdateDatabase"); | 201 | //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase"); |
202 | AvatarData adata = new AvatarData(appearance); | 202 | AvatarData adata = new AvatarData(appearance); |
203 | m_scene.AvatarService.SetAvatar(user, adata); | 203 | m_scene.AvatarService.SetAvatar(user, adata); |
204 | } | 204 | } |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 177cf1e..51a0f2a 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -3727,8 +3727,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
3727 | return; | 3727 | return; |
3728 | 3728 | ||
3729 | UUID itemID = m_appearance.GetAttachedItem(p); | 3729 | UUID itemID = m_appearance.GetAttachedItem(p); |
3730 | UUID assetID = m_appearance.GetAttachedAsset(p); | ||
3731 | 3730 | ||
3731 | //UUID assetID = m_appearance.GetAttachedAsset(p); | ||
3732 | // For some reason assetIDs are being written as Zero's in the DB -- need to track tat down | 3732 | // For some reason assetIDs are being written as Zero's in the DB -- need to track tat down |
3733 | // But they're not used anyway, the item is being looked up for now, so let's proceed. | 3733 | // But they're not used anyway, the item is being looked up for now, so let's proceed. |
3734 | //if (UUID.Zero == assetID) | 3734 | //if (UUID.Zero == assetID) |
@@ -3739,17 +3739,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
3739 | 3739 | ||
3740 | try | 3740 | try |
3741 | { | 3741 | { |
3742 | // Rez from inventory | 3742 | m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p); |
3743 | UUID asset | ||
3744 | = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p); | ||
3745 | |||
3746 | m_log.InfoFormat( | ||
3747 | "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})", | ||
3748 | p, itemID, assetID, asset); | ||
3749 | } | 3743 | } |
3750 | catch (Exception e) | 3744 | catch (Exception e) |
3751 | { | 3745 | { |
3752 | m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}", e.ToString()); | 3746 | m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace); |
3753 | } | 3747 | } |
3754 | } | 3748 | } |
3755 | } | 3749 | } |