summaryrefslogtreecommitdiff
path: root/indra/newview/llgroupactions.cpp
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2022-03-07 00:19:11 -0800
committerBrad Kittenbrink <brad@lindenlab.com>2022-03-07 00:19:11 -0800
commit89ab1e4525445d5efc370c381f7c1e18faab8f16 (patch)
tree3e1326470eddea3310bfd15867c9d54dd3b1652c /indra/newview/llgroupactions.cpp
parent40b80251e48d5f0ae3695d9019261f9e472f3e16 (diff)
parent6ca09a94554ec01f5c94ec60fffd01d7e33f3546 (diff)
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
Diffstat (limited to 'indra/newview/llgroupactions.cpp')
-rw-r--r--indra/newview/llgroupactions.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 12d82d101f..9dca509262 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -372,6 +372,11 @@ void LLGroupActions::show(const LLUUID& group_id)
params["open_tab_name"] = "panel_group_info_sidetray";
LLFloaterSidePanelContainer::showPanel("people", "panel_group_info_sidetray", params);
+ LLFloater *floater = LLFloaterReg::getTypedInstance<LLFloaterSidePanelContainer>("people");
+ if (!floater->isFrontmost())
+ {
+ floater->setVisibleAndFrontmost(TRUE, params);
+ }
}
void LLGroupActions::refresh_notices()