diff options
| author | Stinson Linden <stinson@lindenlab.com> | 2014-06-02 22:32:16 +0100 |
|---|---|---|
| committer | Stinson Linden <stinson@lindenlab.com> | 2014-06-02 22:32:16 +0100 |
| commit | 8392fde6f6a4dfdb2a78382f3587ecd5a6d937ff (patch) | |
| tree | 5c0b89998c072175cd1d1cb3c429a127af8f04d6 /indra/llui/lltoolbar.cpp | |
| parent | 4885c122eaf1b4e304ce598f308d806322efacfc (diff) | |
| parent | 51e0cc8140a2cbe92363cb902144ccc9bf34b7c7 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365.
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) |