aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs14
1 files changed, 5 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 177cf1e..a77f38c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1522,6 +1522,8 @@ namespace OpenSim.Region.Framework.Scenes
1522 } 1522 }
1523 } 1523 }
1524 1524
1525 // If the agent update does move the avatar, then calculate the force ready for the velocity update,
1526 // which occurs later in the main scene loop
1525 if (update_movementflag || (update_rotation && DCFlagKeyPressed)) 1527 if (update_movementflag || (update_rotation && DCFlagKeyPressed))
1526 { 1528 {
1527 // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); 1529 // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
@@ -3727,8 +3729,8 @@ namespace OpenSim.Region.Framework.Scenes
3727 return; 3729 return;
3728 3730
3729 UUID itemID = m_appearance.GetAttachedItem(p); 3731 UUID itemID = m_appearance.GetAttachedItem(p);
3730 UUID assetID = m_appearance.GetAttachedAsset(p);
3731 3732
3733 //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 3734 // 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. 3735 // But they're not used anyway, the item is being looked up for now, so let's proceed.
3734 //if (UUID.Zero == assetID) 3736 //if (UUID.Zero == assetID)
@@ -3739,17 +3741,11 @@ namespace OpenSim.Region.Framework.Scenes
3739 3741
3740 try 3742 try
3741 { 3743 {
3742 // Rez from inventory 3744 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 } 3745 }
3750 catch (Exception e) 3746 catch (Exception e)
3751 { 3747 {
3752 m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}", e.ToString()); 3748 m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace);
3753 } 3749 }
3754 } 3750 }
3755 } 3751 }