summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko Productengine <mnikolenko@productengine.com>2017-01-05 11:45:17 +0200
committerMnikolenko Productengine <mnikolenko@productengine.com>2017-01-05 11:45:17 +0200
commit942bbf943d74b8804c4d3fee98a14c8618a4e031 (patch)
tree36e875c34cf18faff336d93b4c5f5e0e2403d54f /indra/newview
parent8ef99c38a5b7d10d3a121f70929d6e26b264dddb (diff)
MAINT-7029 Pop-up menu isn't shown in Place profile if all menu items are disabled
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpanelplaces.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp
index 0507d6db86..ed942fc7fc 100644
--- a/indra/newview/llpanelplaces.cpp
+++ b/indra/newview/llpanelplaces.cpp
@@ -304,7 +304,11 @@ BOOL LLPanelPlaces::postBuild()
enable_registrar.add("Places.OverflowMenu.Enable", boost::bind(&LLPanelPlaces::onOverflowMenuItemEnable, this, _2));
mPlaceMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_place.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
- if (!mPlaceMenu)
+ if (mPlaceMenu)
+ {
+ mPlaceMenu->setAlwaysShowMenu(TRUE);
+ }
+ else
{
LL_WARNS() << "Error loading Place menu" << LL_ENDL;
}