1 files changed, 7 insertions, 1 deletions

diff --git a/linden/indra/newview/lltoolpie.cpp b/linden/indra/newview/lltoolpie.cpp
index 6879198..4bb2111 100644
--- a/linden/indra/newview/lltoolpie.cpp
+++ b/linden/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)