From 926ea0b39afd04cab469ca17b28f95ebf969e669 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Fri, 27 Jun 2008 21:02:01 +0000 Subject: QAR-669 1.20 Viewer RC11 QAR-648 1.20 Viewer RC10 merge Branch_1-20-Viewer-2 -r 88724:90511 -> release --- indra/newview/lltoolpie.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra/newview/lltoolpie.cpp') diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 5954a7f0ff..b6bcf9544d 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -309,7 +309,13 @@ BOOL LLToolPie::pickAndShowMenu(S32 x, S32 y, MASK mask, BOOL always_show) } else if (mHitObjectID == gAgent.getID() ) { - llassert_always(gPieSelf) ; + if(!gPieSelf) + { + //either at very early startup stage or at late quitting stage, + //this event is ignored. + return TRUE ; + } + gPieSelf->show(x, y, mPieMouseButtonDown); } else if (object) -- cgit v1.2.3