diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-12 21:06:25 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-12 21:06:25 -0800 |
| commit | 3b8463f0fd5f0b2cd54840c34a7a7e303954f768 (patch) | |
| tree | a8c303cc592266109b368a4ae6093e8d2c3cf10f /indra/newview/llviewerwindow.cpp | |
| parent | 660c3b182c12ce0842334127782abc7c3cfba860 (diff) | |
| parent | 1f672990e796ec55f7b684dbf46f939d1ab15607 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1fd7c1cfb3..1dcc7389cb 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2476,9 +2476,6 @@ void append_xui_tooltip(LLView* viewp, LLToolTip::Params& params) // event processing. void LLViewerWindow::updateUI() { - static LLFastTimer::DeclareTimer ftm("Update UI"); - LLFastTimer t(ftm); - static std::string last_handle_msg; LLConsole::updateClass(); @@ -3060,6 +3057,7 @@ void LLViewerWindow::saveLastMouse(const LLCoordGL &point) // Must be called after displayObjects is called, which sets the mGLName parameter // NOTE: This function gets called 3 times: // render_ui_3d: FALSE, FALSE, TRUE +// renderObjectsForSelect: TRUE, pick_parcel_wall, FALSE // render_hud_elements: FALSE, FALSE, FALSE void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, BOOL for_hud ) { |