diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-17 09:50:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-17 09:50:48 -0700 |
| commit | 9c792f03b4f006f5083c9fc98047bfad6bee8e16 (patch) | |
| tree | 5e15865f837e4d7815000b79452f4bdd7245d511 /indra/llui/llmenubutton.cpp | |
| parent | f79b1139fd28b29c51a0c001960ef3f0bb999ec0 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
| -rwxr-xr-x | indra/llui/llmenubutton.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp index 0609cd8b42..303afcda15 100755 --- a/indra/llui/llmenubutton.cpp +++ b/indra/llui/llmenubutton.cpp @@ -93,6 +93,7 @@ void LLMenuButton::setMenu(const std::string& menu_filename, EMenuPosition posit return; } + llassert(LLMenuGL::sMenuContainer != NULL); LLToggleableMenu* menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>(menu_filename, LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); if (!menu) { |