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/lltextbase.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/lltextbase.cpp')
| -rwxr-xr-x | indra/llui/lltextbase.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 62edbadb07..30e6c6248e 100755 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1955,6 +1955,7 @@ void LLTextBase::createUrlContextMenu(S32 x, S32 y, const std::string &in_url) // create and return the context menu from the XUI file delete mPopupMenu; + llassert(LLMenuGL::sMenuContainer != NULL); mPopupMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu>(xui_file, LLMenuGL::sMenuContainer, LLMenuHolderGL::child_registry_t::instance()); if (mIsFriendSignal) |