diff options
| author | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:28:35 -0800 |
|---|---|---|
| committer | Bennett Goble <signal@lindenlab.com> | 2021-12-11 10:29:37 -0800 |
| commit | 0b95b9d008a0878b5d57262e529cef61fb29ea24 (patch) | |
| tree | 6e12a7949c9a69a5e1ad170220b4e9a82a453142 /indra/newview/llmaniprotate.cpp | |
| parent | f729cfc33f258781c5fd85a3d8773bf6149d12db (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into SL-15742
Diffstat (limited to 'indra/newview/llmaniprotate.cpp')
| -rw-r--r-- | indra/newview/llmaniprotate.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index c3e39429a2..7c942e8b53 100644 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -105,7 +105,10 @@ void LLManipRotate::handleSelect() { // *FIX: put this in mouseDown? LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK); - gFloaterTools->setStatusText("rotate"); + if (gFloaterTools) + { + gFloaterTools->setStatusText("rotate"); + } LLManip::handleSelect(); } |