diff options
author | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-02 19:11:06 +0000 |
commit | d4462963c6ba5db2088723bbedc7b60f1184c594 (patch) | |
tree | 34aaba4b31f93388b0ce3b2b36e9c49823bec2cf /indra/newview/lltoolfocus.cpp | |
parent | b53c377727d216cb277ba14ba4c73b9b9bb96b32 (diff) |
merge -r 58503:58641 maintenance -> release
Diffstat (limited to 'indra/newview/lltoolfocus.cpp')
-rw-r--r-- | indra/newview/lltoolfocus.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index 2d1cb9c493..c439797c47 100644 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -69,13 +69,13 @@ LLToolCamera::~LLToolCamera() // virtual void LLToolCamera::handleSelect() { - gFloaterTools->setStatusText("Click and drag to change view"); + if (gFloaterTools) gFloaterTools->setStatusText("Click and drag to change view"); } // virtual void LLToolCamera::handleDeselect() { - gFloaterTools->setStatusText(""); + if (gFloaterTools) gFloaterTools->setStatusText(""); // gAgent.setLookingAtAvatar(FALSE); } |