Second Life viewer sources 1.23.0-RC

1 files changed, 50 insertions, 38 deletions

diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 05deb5f..9d60d20 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -117,7 +118,7 @@ public:
         void showProperties();
         void buyItem();
         S32 getPrice();
-        static void commitBuyItem(S32 option, void* data);
+        static bool commitBuyItem(const LLSD& notification, const LLSD& response);
 
         // LLFolderViewEventListener functionality
         virtual const std::string& getName() const;
@@ -224,21 +225,21 @@ void LLTaskInvFVBridge::buyItem()
         LLViewerObject* obj;
         if( ( obj = gObjectList.findObject( mPanel->getTaskUUID() ) ) && obj->isAttachment() )
         {
-                gViewerWindow->alertXml("Cannot_Purchase_an_Attachment");
+                LLNotifications::instance().add("Cannot_Purchase_an_Attachment");
                 llinfos << "Attempt to purchase an attachment" << llendl;
                 delete inv;
         }
         else
         {
-        LLStringUtil::format_map_t args;
-        args["[PRICE]"] = llformat("%d",sale_info.getSalePrice());
-        args["[OWNER]"] = owner_name;
+        LLSD args;
+        args["PRICE"] = llformat("%d",sale_info.getSalePrice());
+        args["OWNER"] = owner_name;
         if (sale_info.getSaleType() != LLSaleInfo::FS_CONTENTS)
         {
                 U32 next_owner_mask = perm.getMaskNextOwner();
-                args["[MODIFYPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_MODIFY) ? "PermYes" : "PermNo");
-                args["[COPYPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_COPY) ? "PermYes" : "PermNo");
-                args["[RESELLPERM]"] = LLAlertDialog::getTemplateMessage((next_owner_mask & PERM_TRANSFER) ? "PermYes" : "PermNo");
+                args["MODIFYPERM"] = LLNotifications::instance().getGlobalString((next_owner_mask & PERM_MODIFY) ? "PermYes" : "PermNo");
+                args["COPYPERM"] = LLNotifications::instance().getGlobalString((next_owner_mask & PERM_COPY) ? "PermYes" : "PermNo");
+                args["RESELLPERM"] = LLNotifications::instance().getGlobalString((next_owner_mask & PERM_TRANSFER) ? "PermYes" : "PermNo");
         }
 
                 std::string alertdesc;
@@ -256,7 +257,11 @@ void LLTaskInvFVBridge::buyItem()
                 break;
         }
 
-        gViewerWindow->alertXml(alertdesc, args, LLTaskInvFVBridge::commitBuyItem, (void*)inv);
+                LLSD payload;
+                payload["task_id"] = inv->mTaskID;
+                payload["item_id"] = inv->mItemID;
+                payload["type"] = inv->mType;
+                LLNotifications::instance().add(alertdesc, args, payload, LLTaskInvFVBridge::commitBuyItem);
         }
 }
 
@@ -274,14 +279,13 @@ S32 LLTaskInvFVBridge::getPrice()
 }
 
 // static
-void LLTaskInvFVBridge::commitBuyItem(S32 option, void* data)
+bool LLTaskInvFVBridge::commitBuyItem(const LLSD& notification, const LLSD& response)
 {
-        LLBuyInvItemData* inv = (LLBuyInvItemData*)data;
-        if(!inv) return;
+        S32 option = LLNotification::getSelectedOption(notification, response);
         if(0 == option)
         {
-                LLViewerObject* object = gObjectList.findObject(inv->mTaskID);
-                if(!object || !object->getRegion()) return;
+                LLViewerObject* object = gObjectList.findObject(notification["payload"]["task_id"].asUUID());
+                if(!object || !object->getRegion()) return false;
 
 
                 LLMessageSystem* msg = gMessageSystem;
@@ -290,13 +294,13 @@ void LLTaskInvFVBridge::commitBuyItem(S32 option, void* data)
                 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
                 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
                 msg->nextBlockFast(_PREHASH_Data);
-                msg->addUUIDFast(_PREHASH_ObjectID, inv->mTaskID);
-                msg->addUUIDFast(_PREHASH_ItemID, inv->mItemID);
+                msg->addUUIDFast(_PREHASH_ObjectID, notification["payload"]["task_id"].asUUID());
+                msg->addUUIDFast(_PREHASH_ItemID, notification["payload"]["item_id"].asUUID());
                 msg->addUUIDFast(_PREHASH_FolderID,
-                                                 gInventory.findCategoryUUIDForType(inv->mType));
+                        gInventory.findCategoryUUIDForType((LLAssetType::EType)notification["payload"]["type"].asInteger()));
                 msg->sendReliable(object->getRegion()->getHost());
         }
-        delete inv;
+        return false;
 }
 
 const std::string& LLTaskInvFVBridge::getName() const
@@ -425,25 +429,25 @@ BOOL LLTaskInvFVBridge::isItemRemovable()
 typedef std::pair<LLUUID, std::list<LLUUID> > two_uuids_list_t;
 typedef std::pair<LLPanelInventory*, two_uuids_list_t> remove_data_t;
 
-void remove_task_inventory_callback(S32 option, void* user_data)
+bool remove_task_inventory_callback(const LLSD& notification, const LLSD& response, LLPanelInventory* panel)
 {
-        remove_data_t* data = (remove_data_t*)user_data;
-        LLViewerObject* object = NULL;
-        object = gObjectList.findObject(data->second.first);
+        S32 option = LLNotification::getSelectedOption(notification, response);
+        LLViewerObject* object = gObjectList.findObject(notification["payload"]["task_id"].asUUID());
         if(option == 0 && object)
         {
                 // yes
-                std::list<LLUUID>::iterator list_it;
-                std::list<LLUUID>& id_list = data->second.second;
-                for (list_it = id_list.begin(); list_it != id_list.end(); ++list_it)
+                LLSD::array_const_iterator list_end = notification["payload"]["inventory_ids"].endArray();
+                for (LLSD::array_const_iterator list_it = notification["payload"]["inventory_ids"].beginArray();
+                        list_it != list_end; 
+                        ++list_it)
                 {
-                        object->removeInventory(*list_it);
+                        object->removeInventory(list_it->asUUID());
                 }
 
                 // refresh the UI.
-                data->first->refresh();
+                panel->refresh();
         }
-        delete data;
+        return false;
 }
 
 BOOL LLTaskInvFVBridge::removeItem()
@@ -465,7 +469,10 @@ BOOL LLTaskInvFVBridge::removeItem()
                                 data->first = mPanel;
                                 data->second.first = mPanel->getTaskUUID();
                                 data->second.second.push_back(mUUID);
-                                gViewerWindow->alertXml("RemoveItemWarn", remove_task_inventory_callback, (void*)data);
+                                LLSD payload;
+                                payload["task_id"] = mPanel->getTaskUUID();
+                                payload["inventory_ids"].append(mUUID);
+                                LLNotifications::instance().add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel));
                                 return FALSE;
                         }
                 }
@@ -488,15 +495,15 @@ void LLTaskInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>&
 
         if (!object->permModify())
         {
-                remove_data_t* data = new remove_data_t;
-                data->first = mPanel;
-                data->second.first = mPanel->getTaskUUID();
+                LLSD payload;
+                payload["task_id"] = mPanel->getTaskUUID();
                 for (S32 i = 0; i < (S32)batch.size(); i++)
                 {
                         LLTaskInvFVBridge* itemp = (LLTaskInvFVBridge*)batch[i];
-                        data->second.second.push_back(itemp->getUUID());
+                        payload["inventory_ids"].append(itemp->getUUID());
                 }
-                gViewerWindow->alertXml("RemoveItemWarn", remove_task_inventory_callback, (void*)data);
+                LLNotifications::instance().add("RemoveItemWarn", LLSD(), payload, boost::bind(&remove_task_inventory_callback, _1, _2, mPanel));
+                
         }
         else
         {
@@ -630,9 +637,14 @@ void LLTaskInvFVBridge::performAction(LLFolderView* folder, LLInventoryModel* mo
 void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 {
         LLInventoryItem* item = findItem();
-        if(!item) return;
         std::vector<std::string> items;
         std::vector<std::string> disabled_items;
+        
+        if (!item)
+        {
+                hideContextEntries(menu, items, disabled_items);
+                return;
+        }
 
          // *TODO: Translate
         if(gAgent.allowOperation(PERM_OWNER, item->getPermissions(),
@@ -1932,7 +1944,7 @@ void LLPanelInventory::draw()
                 // *TODO: Translate
                 if((LLUUID::null != mTaskUUID) && (!mHaveInventory))
                 {
-                        LLFontGL::sSansSerif->renderUTF8(std::string("Loading contents..."), 0,
+                        LLFontGL::getFontSansSerif()->renderUTF8(std::string("Loading contents..."), 0,
                                                                                  (S32)(getRect().getWidth() * 0.5f),
                                                                                  10,
                                                                                  LLColor4( 1, 1, 1, 1 ),
@@ -1941,7 +1953,7 @@ void LLPanelInventory::draw()
                 }
                 else if(mHaveInventory)
                 {
-                        LLFontGL::sSansSerif->renderUTF8(std::string("No contents"), 0,
+                        LLFontGL::getFontSansSerif()->renderUTF8(std::string("No contents"), 0,
                                                                                  (S32)(getRect().getWidth() * 0.5f),
                                                                                  10,
                                                                                  LLColor4( 1, 1, 1, 1 ),