diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:38:19 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-11-19 04:38:19 +0200 |
| commit | 9a1af101cd89c6b908eb2810d94de706b37bd0ea (patch) | |
| tree | b3abc99610c08b854fe69f5170b3c85bd544bdfc /indra/newview/llmaniprotate.cpp | |
| parent | baeb14b7562ac926ab39c8abbb6cd910310548d8 (diff) | |
| parent | 9957c28ddc5e5c129af2db662da7d69f1509af65 (diff) | |
Merge branch 'master' into DRTVWR-543-maint
# Conflicts:
# indra/newview/llagentwearables.cpp
# indra/newview/llvoicevivox.cpp
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(); } |