From 4a6bacea0f8dcff959028f285bc533852da608b5 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Thu, 28 Aug 2008 23:57:41 +0000 Subject: merge viewer/viewer_1-21 94170-94770 -> release merge viewer/viewer_1-21-0 94830-95157 -> release Includes: QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki! QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme --- indra/newview/llviewerobjectlist.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerobjectlist.cpp') diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 6d0137663c..a221086367 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1216,8 +1216,13 @@ void LLViewerObjectList::renderPickList(const LLRect& screen_rect, BOOL pick_par gGL.color4f(1,1,1,1); gViewerWindow->renderSelections( TRUE, pick_parcel_wall, FALSE ); - // render pickable ui elements, like names, etc. - LLHUDObject::renderAllForSelect(); + //fix for DEV-19335. Don't pick hud objects when customizing avatar (camera mode doesn't play nice with nametags). + if (!gAgent.cameraCustomizeAvatar()) + { + // render pickable ui elements, like names, etc. + LLHUDObject::renderAllForSelect(); + } + gGL.flush(); LLVertexBuffer::unbind(); -- cgit v1.2.3