livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-6018 Open URL dialog spam 

Removed "close by owner" item form chiclet's right-click menu
master
AndreyL ProductEngine 2016-01-12 21:08:27 +02:00
parent 1e0753ddb2
commit 6df80ebcc4
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llchiclet.cpp
View File

@ -1092,10 +1092,6 @@ void LLScriptChiclet::onMenuItemClicked(const LLSD& user_data)
{
LLScriptFloaterManager::instance().removeNotification(getSessionId());
}
else if ("end_owner" == action)
{
LLScriptFloaterManager::instance().removeAllNotificationsByOwner(getSessionId());
}
}
void LLScriptChiclet::createPopupMenu()

12
indra/newview/llscriptfloater.cpp
View File

@ -420,18 +420,6 @@ void LLScriptFloaterManager::onAddNotification(const LLUUID& notification_id)
toggleScriptFloater(notification_id, set_new_message);
}
void LLScriptFloaterManager::removeAllNotificationsByOwner(const LLUUID& notification_id)
{
LLNotificationPtr notification = LLNotifications::instance().find(notification_id);
if (notification != NULL && !notification->isCancelled())
{
LLSD payload = notification->getPayload();
LLUUID owner = payload.get("owner_id").asUUID();
LLNotifications::instance().cancelByOwner(owner);
}
}
void LLScriptFloaterManager::removeNotification(const LLUUID& notification_id)
{
LLNotificationPtr notification = LLNotifications::instance().find(notification_id);

5
indra/newview/llscriptfloater.h
View File

@ -59,11 +59,6 @@ public:
*/
void onAddNotification(const LLUUID& notification_id);
/**
* Removes all notifications by owner id.
*/
void removeAllNotificationsByOwner(const LLUUID& notification_id);
/**
* Removes notification.
*/

8
indra/newview/skins/default/xui/en/menu_script_chiclet.xml
View File

@ -16,12 +16,4 @@
function="ScriptChiclet.Action"
parameter="end" />
</menu_item_call>
<menu_item_call
label="Close by owner"
layout="topleft"
name="CloseByOwner">
<menu_item_call.on_click
function="ScriptChiclet.Action"
parameter="end_owner" />
</menu_item_call>
</menu>