Second Life viewer sources 1.17.0.12

1 files changed, 5 insertions, 1 deletions

diff --git a/linden/indra/newview/lltoolgrab.cpp b/linden/indra/newview/lltoolgrab.cpp
index b56e762..d6f1f0e 100644
--- a/linden/indra/newview/lltoolgrab.cpp
+++ b/linden/indra/newview/lltoolgrab.cpp
@@ -95,7 +95,11 @@ LLToolGrab::~LLToolGrab()
 // virtual
 void LLToolGrab::handleSelect()
 {
-        gFloaterTools->setStatusText("Drag to move objects, Ctrl to lift, Ctrl-Shift to spin");
+        if(gFloaterTools)
+        {
+                // viewer can crash during startup if we don't check.
+                gFloaterTools->setStatusText("Drag to move objects, Ctrl to lift, Ctrl-Shift to spin");
+        }
         gGrabBtnVertical = FALSE;
         gGrabBtnSpin = FALSE;
 }