diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-09-10 10:19:50 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-09-10 10:19:50 -0700 |
| commit | a97f13e16177425cceac9f0c4abf9935bbda9f8c (patch) | |
| tree | 4246799b9ce9d8b97d6b9cfd851114dbb214f505 /indra/newview/llviewerwindow.cpp | |
| parent | cddce7bbb8975c27d561e9868e8a28f48e2a5208 (diff) | |
| parent | e241670694959833feaa0e667222b337095eb683 (diff) | |
Merge viewer-release 6.3.2
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index e4f3b9bae4..4c6a3dd33d 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3819,7 +3819,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, BOOL draw_handles = TRUE; - if (tool == LLToolCompTranslate::getInstance() && !all_selected_objects_move) + if (tool == LLToolCompTranslate::getInstance() && !all_selected_objects_move && !LLSelectMgr::getInstance()->isSelfAvatarSelected()) { draw_handles = FALSE; } @@ -4734,6 +4734,7 @@ BOOL LLViewerWindow::rawSnapshot(LLImageRaw *raw, S32 image_width, S32 image_hei { // Required for showing the GUI in snapshots and performing bloom composite overlay // Call even if show_ui is FALSE + LL_RECORD_BLOCK_TIME(FTM_RENDER_UI); render_ui(scale_factor, subfield); swap(); } |