diff options
author | simon <none@none> | 2014-06-17 10:40:42 -0700 |
---|---|---|
committer | simon <none@none> | 2014-06-17 10:40:42 -0700 |
commit | 592024b5805a116c9d0bef893127427df0741b41 (patch) | |
tree | bcadc0685873b40e23254cf3d6232e8f1f3f0e1b /indra/newview/llchiclet.cpp | |
parent | 9e855b03b7f285794520eaf781b6a963b6cd51d9 (diff) | |
parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) |
Merge viewer-release and become version 3.7.9
Diffstat (limited to 'indra/newview/llchiclet.cpp')
-rwxr-xr-x | indra/newview/llchiclet.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index b1dce42dfd..c0823182c0 100755 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -204,6 +204,7 @@ void LLNotificationChiclet::createMenu() enable_registrar.add("NotificationWellChicletMenu.EnableItem", boost::bind(&LLNotificationChiclet::enableMenuItem, this, _2)); + llassert(LLMenuGL::sMenuContainer != NULL); mContextMenu = LLUICtrlFactory::getInstance()->createFromFile<LLContextMenu> ("menu_notification_well_button.xml", LLMenuGL::sMenuContainer, |