summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-06-11 22:11:02 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-06-11 22:11:02 +0000
commit65c038685f18eb8f70756e584482d7f97fa8c383 (patch)
tree54671b1e50b57d1757cebab77306b54db1a08243
parent28435a08988022f5dd1d0e931b6ad048b8950e11 (diff)
fix for crash because of recent changes in tool handleSelect() from Richard. SL-44935
-rw-r--r--indra/newview/lltoolgrab.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index 3250e42232..6a65942785 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -75,7 +75,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;
}