Second Life viewer sources 1.19.1.0

1 files changed, 35 insertions, 17 deletions

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 58b8af2..6d981cc 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -488,11 +488,11 @@ void LLInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 }
 
 // *TODO: remove this
-BOOL LLInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id)
+BOOL LLInvFVBridge::startDrag(EDragAndDropType* type, LLUUID* id) const
 {
         BOOL rv = FALSE;
 
-        LLInventoryObject* obj = getInventoryObject();
+        const LLInventoryObject* obj = getInventoryObject();
 
         if(obj)
         {
@@ -3273,8 +3273,20 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach
 {
         LLAttachmentRezAction* rez_action = new LLAttachmentRezAction;
         rez_action->mItemID = item->getUUID();
-        rez_action->mAttachPt = gAgent.getAvatarObject()->mAttachmentPoints.reverseLookup(attachment);
-
+        S32 attach_pt = 0;
+        if (gAgent.getAvatarObject() && attachment)
+        {
+                for (LLVOAvatar::attachment_map_t::iterator iter = gAgent.getAvatarObject()->mAttachmentPoints.begin();
+                         iter != gAgent.getAvatarObject()->mAttachmentPoints.end(); ++iter)
+                {
+                        if (iter->second == attachment)
+                        {
+                                rez_action->mAttachPt = iter->first;
+                                break;
+                        }
+                }
+        }
+        rez_action->mAttachPt = attach_pt;
         if (attachment && attachment->getObject())
         {
                 gViewerWindow->alertXml("ReplaceAttachment", confirm_replace_attachment_rez, (void*)rez_action);
@@ -3365,10 +3377,11 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                                         attach_hud_menu && (attach_hud_menu->getChildCount() == 0) &&
                                         avatarp)
                                 {
-                                        for (LLViewerJointAttachment* attachment = avatarp->mAttachmentPoints.getFirstData(); 
-                                                attachment;
-                                                attachment = gAgent.getAvatarObject()->mAttachmentPoints.getNextData())
+                                        for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); 
+                                                 iter != avatarp->mAttachmentPoints.end(); )
                                         {
+                                                LLVOAvatar::attachment_map_t::iterator curiter = iter++;
+                                                LLViewerJointAttachment* attachment = curiter->second;
                                                 LLMenuItemCallGL *new_item;
                                                 if (attachment->getIsHUDAttachment())
                                                 {
@@ -3509,8 +3522,13 @@ struct LLFoundData
 struct LLWearableHoldingPattern
 {
         LLWearableHoldingPattern() : mResolved(0) {}
-        ~LLWearableHoldingPattern() { mFoundList.deleteAllData(); }
-        LLDoubleLinkedList<LLFoundData> mFoundList;
+        ~LLWearableHoldingPattern()
+        {
+                for_each(mFoundList.begin(), mFoundList.end(), DeletePointer());
+                mFoundList.clear();
+        }
+        typedef std::list<LLFoundData*> found_list_t;
+        found_list_t mFoundList;
         S32 mResolved;
 };
 
@@ -3900,7 +3918,7 @@ void wear_inventory_category_on_avatar_step2( BOOL proceed, void* userdata )
                                                                                 item_array.get(i)->getAssetUUID(),
                                                                                 item_array.get(i)->getName(),
                                                                                 item_array.get(i)->getType());
-                                holder->mFoundList.addData(found);
+                                holder->mFoundList.push_front(found);
                                 found_container.put(found);
                         }
                         for(i = 0; i < wearable_count; ++i)
@@ -3991,10 +4009,10 @@ void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void* data)
         
         if(wearable)
         {
-                for(LLFoundData* data = holder->mFoundList.getFirstData();
-                        data;
-                        data = holder->mFoundList.getNextData() )
+                for (LLWearableHoldingPattern::found_list_t::iterator iter = holder->mFoundList.begin();
+                         iter != holder->mFoundList.end(); ++iter)
                 {
+                        LLFoundData* data = *iter;
                         if(wearable->getID() == data->mAssetID)
                         {
                                 data->mWearable = wearable;
@@ -4003,7 +4021,7 @@ void wear_inventory_category_on_avatar_loop(LLWearable* wearable, void* data)
                 }
         }
         holder->mResolved += 1;
-        if(holder->mResolved >= holder->mFoundList.getLength())
+        if(holder->mResolved >= (S32)holder->mFoundList.size())
         {
                 wear_inventory_category_on_avatar_step3(holder, append);
         }
@@ -4019,10 +4037,10 @@ void wear_inventory_category_on_avatar_step3(LLWearableHoldingPattern* holder, B
         // that we recursed through.
         for( S32 i = 0; i < WT_COUNT; i++ )
         {
-                for(LLFoundData* data = holder->mFoundList.getFirstData();
-                        data;
-                        data = holder->mFoundList.getNextData())
+                for (LLWearableHoldingPattern::found_list_t::iterator iter = holder->mFoundList.begin();
+                         iter != holder->mFoundList.end(); ++iter)
                 {
+                        LLFoundData* data = *iter;
                         LLWearable* wearable = data->mWearable;
                         if( wearable && ((S32)wearable->getType() == i) )
                         {