diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:29:30 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-11-11 09:29:30 -0500 |
| commit | 20921d6a1a2e98fee750cb5a76adddb7266183f3 (patch) | |
| tree | 8966865c6484af39f1d2af276f961f0999e49a3f /indra/newview/llviewerobjectlist.cpp | |
| parent | b5df1d2abcef04ee5f491a7414189f4e82faaa1e (diff) | |
| parent | fc22e2cf5bfc97caaf1ad69814b7dd217cbafef0 (diff) | |
merge performance data tracking system STORM-104
Diffstat (limited to 'indra/newview/llviewerobjectlist.cpp')
| -rw-r--r-- | indra/newview/llviewerobjectlist.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index f9bf0543c4..a414e86866 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -1274,34 +1274,6 @@ void LLViewerObjectList::generatePickList(LLCamera &camera) } } -void LLViewerObjectList::renderPickList(const LLRect& screen_rect, BOOL pick_parcel_wall, BOOL render_transparent) -{ - gRenderForSelect = TRUE; - - gPipeline.renderForSelect(mSelectPickList, render_transparent, screen_rect); - - // - // Render pass for selected objects - // - gGL.color4f(1,1,1,1); - gViewerWindow->renderSelections( TRUE, pick_parcel_wall, FALSE ); - - //fix for DEV-19335. Don't pick hud objects when customizing avatar (camera mode doesn't play nice with nametags). - if (!gAgentCamera.cameraCustomizeAvatar()) - { - // render pickable ui elements, like names, etc. - LLHUDObject::renderAllForSelect(); - } - - gGL.flush(); - LLVertexBuffer::unbind(); - - gRenderForSelect = FALSE; - - //llinfos << "Rendered " << count << " for select" << llendl; - //llinfos << "Took " << pick_timer.getElapsedTimeF32()*1000.f << "ms to pick" << llendl; -} - LLViewerObject *LLViewerObjectList::getSelectedObject(const U32 object_id) { std::set<LLViewerObject*>::iterator pick_it; |