diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-06-16 11:42:37 -0400 |
| commit | e15002a11cf5081e0697065cb017ba0af6c4b32d (patch) | |
| tree | d60ac6d3a85d114b7860e42be5d9ff3338a6a169 /indra/llui/lltoolbar.cpp | |
| parent | 78be5c3aa5f7263698bec5bcbccb24c150f78d09 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
merge changes for 3.7.9-release
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rwxr-xr-x | indra/llui/lltoolbar.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index f9bdd87087..abc2b6e9ca 100755 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -148,6 +148,7 @@ void LLToolBar::createContextMenu() enable_reg.add("Toolbars.CheckSetting", boost::bind(&LLToolBar::isSettingChecked, this, _2)); // Create the context menu + llassert(LLMenuGL::sMenuContainer != NULL); LLContextMenu* menu = LLUICtrlFactory::instance().createFromFile<LLContextMenu>("menu_toolbars.xml", LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); if (menu) |