summaryrefslogtreecommitdiff
path: root/indra/newview/llchiclet.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-09-28 22:39:06 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-09-28 22:39:06 +0300
commit83822fd1992140b85966ca613b026c4bc6c38005 (patch)
tree8dadfcd76a9c27193e8009d1d361e91e41cf7e71 /indra/newview/llchiclet.cpp
parent652e8459001e052edd6eeef0b919d4d68c8daa58 (diff)
parentbac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff)
Merge branch 'master' into DRTVWR-516-maint
# Conflicts: # indra/newview/llvocache.cpp
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rw-r--r--indra/newview/llchiclet.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index dedb06c945..8d89455cd4 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -1092,6 +1092,10 @@ void LLScriptChiclet::onMenuItemClicked(const LLSD& user_data)
{
LLScriptFloaterManager::instance().removeNotification(getSessionId());
}
+ else if ("close all" == action)
+ {
+ LLIMWellWindow::getInstance()->closeAll();
+ }
}
void LLScriptChiclet::createPopupMenu()