diff options
| author | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-03-08 10:54:23 -0800 |
| commit | 18ebacefcfb5909a58a213a97c6a687afe9b877e (patch) | |
| tree | 5b48ebad64a253bd9aa50371c2308389cbec64bf /indra/newview/llviewerwindow.cpp | |
| parent | 34d1d34ca100fd137c2a85f0e0f330730fb70aba (diff) | |
| parent | 42606dbbb5f452211e4fc30ee0ed41334fc14e8d (diff) | |
Merge with viewer 2 beta 4
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index d0a1a31ebd..ea1afafe85 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1202,12 +1202,8 @@ BOOL LLViewerWindow::handlePaint(LLWindow *window, S32 x, S32 y, S32 width, S //SetBKColor(hdc, RGB(255, 255, 255)); FillRect(hdc, &wnd_rect, CreateSolidBrush(RGB(255, 255, 255))); - std::string name_str; - LLAgentUI::buildName(name_str); - std::string temp_str; - temp_str = llformat( "%s FPS %3.1f Phy FPS %2.1f Time Dil %1.3f", /* Flawfinder: ignore */ - name_str.c_str(), + temp_str = llformat( "FPS %3.1f Phy FPS %2.1f Time Dil %1.3f", /* Flawfinder: ignore */ LLViewerStats::getInstance()->mFPSStat.getMeanPerSec(), LLViewerStats::getInstance()->mSimPhysicsFPS.getPrev(0), LLViewerStats::getInstance()->mSimTimeDilation.getPrev(0)); @@ -1744,7 +1740,7 @@ void LLViewerWindow::shutdownViews() // destroy the nav bar, not currently part of gViewerWindow // *TODO: Make LLNavigationBar part of gViewerWindow delete LLNavigationBar::getInstance(); - + // destroy menus after instantiating navbar above, as it needs // access to gMenuHolder cleanup_menus(); |