diff options
| author | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-01-09 12:22:24 -0800 |
| commit | 15e6939342956f830996299352bcf7fffa7c3b85 (patch) | |
| tree | dcd6443f049d35b3f3401d768b1eab735eda363b /indra/llui/llmenubutton.cpp | |
| parent | d8a81b240e828a8ab27709fb11038a4b5c4d5428 (diff) | |
| parent | 1d0d485b69bbbfd63d2d56a795d818131db2667c (diff) | |
merge with release
Diffstat (limited to 'indra/llui/llmenubutton.cpp')
| -rwxr-xr-x | indra/llui/llmenubutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llmenubutton.cpp b/indra/llui/llmenubutton.cpp index 746ade4648..0609cd8b42 100755 --- a/indra/llui/llmenubutton.cpp +++ b/indra/llui/llmenubutton.cpp @@ -96,7 +96,7 @@ void LLMenuButton::setMenu(const std::string& menu_filename, EMenuPosition posit LLToggleableMenu* menu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>(menu_filename, LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); if (!menu) { - llwarns << "Error loading menu_button menu" << llendl; + LL_WARNS() << "Error loading menu_button menu" << LL_ENDL; return; } |