From 5121891e473ba6e511c2f2cff2a5c1217e4c93a8 Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Tue, 22 Dec 2009 17:01:31 +0200 Subject: Update for normal bug EXT-3520 - Can't open Group Notices or Attachments. Attachments will be opened in a preview floater. --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 6a31bbfa1e..519f58ca95 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -906,7 +906,20 @@ void open_inventory_offer(const std::vector& items, const std::string& f LLFloaterReg::showInstance("preview_texture", LLSD(item_id), take_focus); break; } + case LLAssetType::AT_ANIMATION: + LLFloaterReg::showInstance("preview_anim", LLSD(item_id), take_focus); + break; + case LLAssetType::AT_GESTURE: + LLFloaterReg::showInstance("preview_gesture", LLSD(item_id), take_focus); + break; + case LLAssetType::AT_SCRIPT: + LLFloaterReg::showInstance("preview_script", LLSD(item_id), take_focus); + break; + case LLAssetType::AT_SOUND: + LLFloaterReg::showInstance("preview_sound", LLSD(item_id), take_focus); + break; default: + LLFloaterReg::showInstance("properties", LLSD(item_id), take_focus); break; } } -- cgit v1.3 From 57626b20151a181e1dcf6c4f119f4765ee0f018b Mon Sep 17 00:00:00 2001 From: Dmitry Zaporozhan Date: Wed, 23 Dec 2009 13:27:29 +0200 Subject: Update for normal bug EXT-3520 - Can't open Group Notices or Attachments. Disabled generic preview floater as it spawns for all new inventory items. --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 519f58ca95..737f7a224d 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -919,7 +919,6 @@ void open_inventory_offer(const std::vector& items, const std::string& f LLFloaterReg::showInstance("preview_sound", LLSD(item_id), take_focus); break; default: - LLFloaterReg::showInstance("properties", LLSD(item_id), take_focus); break; } } -- cgit v1.3 From f39ef6ee2c165ec08ff7592e6d57edfdc429bac3 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Sat, 26 Dec 2009 13:27:45 +0200 Subject: fixed EXT-3702 “"group invitation accepted" toast should be non-interactive”, made system IM notifications(IM_MESSAGEBOX) as notifytip; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 72e3c27bc9..d0eddc24b2 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1849,7 +1849,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) // This is a block, modeless dialog. //*TODO: Translate args["MESSAGE"] = message; - LLNotificationsUtil::add("SystemMessage", args); + LLNotificationsUtil::add("SystemMessageTip", args); } break; case IM_GROUP_NOTICE: -- cgit v1.3 From 7319c80ee16b2e009169548bf286b9e514027808 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Sat, 26 Dec 2009 15:00:05 +0200 Subject: implemented EXT-3701 “Replace "accept" button with "show" in the inventory offer toast”; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : product-engine --- indra/newview/llviewermessage.cpp | 6 +++--- indra/newview/skins/default/xui/en/notifications.xml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'indra/newview/llviewermessage.cpp') diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index d0eddc24b2..87045d2abf 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1158,9 +1158,9 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& default: LL_WARNS("Messaging") << "inventory_offer_callback: unknown offer type" << LL_ENDL; break; - } // end switch (mIM) - - // Show falls through to accept. + } + break; + // end switch (mIM) case IOR_ACCEPT: msg->addU8Fast(_PREHASH_Dialog, (U8)(mIM + 1)); diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index af02a182db..9d3c31c4e6 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -5022,9 +5022,9 @@ An object named [OBJECTFROMNAME] owned by (an unknown Resident) has given you [O [ITEM_SLURL]