diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-07-25 11:36:57 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-07-25 11:36:57 +0300 |
| commit | 21aca031d7c6e34249dfb5ba5c19f04ee64f8a03 (patch) | |
| tree | 93a7b019ee1c76bc5f987b2a52b4eaa8537604d2 /indra/newview/lltoolpie.cpp | |
| parent | f69b11691d9911264d42a9c53d407a808591ee7c (diff) | |
MAINT-4287 FIXED Check that gMenuHolder is not NULL
Diffstat (limited to 'indra/newview/lltoolpie.cpp')
| -rwxr-xr-x | indra/newview/lltoolpie.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index eec9760d2d..e4353aafaa 100755 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -1315,7 +1315,7 @@ void LLToolPie::handleDeselect() // Menu may be still up during transfer to different tool. // toolfocus and toolgrab should retain menu, they will clear it if needed MASK override_mask = gKeyboard ? gKeyboard->currentMask(TRUE) : 0; - if (!gMenuHolder->getVisible() || (override_mask & (MASK_ALT | MASK_CONTROL)) == 0) + if (gMenuHolder && (!gMenuHolder->getVisible() || (override_mask & (MASK_ALT | MASK_CONTROL)) == 0)) { // in most cases menu is useless without correct selection, so either keep both or discard both gMenuHolder->hideMenus(); |