diff options
| author | Stinson Linden <stinson@lindenlab.com> | 2014-05-05 23:24:34 +0100 |
|---|---|---|
| committer | Stinson Linden <stinson@lindenlab.com> | 2014-05-05 23:24:34 +0100 |
| commit | 001621dfc21942a6ae0075ca3eef31720f42477b (patch) | |
| tree | cd86dcd3b02df87a76ee993e4bf98ec4e8223f5f /indra/llui/llscrolllistctrl.cpp | |
| parent | 205503dd84479be4989e5f5567a1d187cc0e71eb (diff) | |
MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
| -rwxr-xr-x | indra/llui/llscrolllistctrl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 3708071e11..5f72ee3ac6 100755 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -1815,6 +1815,7 @@ BOOL LLScrollListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask) // create the context menu from the XUI file and display it std::string menu_name = is_group ? "menu_url_group.xml" : "menu_url_agent.xml"; delete mPopupMenu; + llassert(LLMenuGL::sMenuContainer != NULL); mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>( menu_name, LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); if (mPopupMenu) |