From 1e3d134625c1e89ee3480f4159fa7d60b0438571 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 1 Oct 2010 22:23:50 +0200 Subject: fix: don't play balance changed ui-sound when relogging into account with different balance --- linden/indra/newview/llappviewer.cpp | 4 ++++ linden/indra/newview/llstatusbar.h | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 3f9adde..18df447 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -1191,6 +1191,10 @@ bool LLAppViewer::cleanup() LLAvatarTracker::instance().reset(); } + //reset balance for not playing the UI-Sound + //when relogging into another account + gStatusBar->clearBalance(); + if (mQuitRequested) { display_cleanup(); diff --git a/linden/indra/newview/llstatusbar.h b/linden/indra/newview/llstatusbar.h index 92be319..9ed067f 100644 --- a/linden/indra/newview/llstatusbar.h +++ b/linden/indra/newview/llstatusbar.h @@ -121,7 +121,8 @@ public: S32 getSquareMetersCommitted() const; S32 getSquareMetersLeft() const; LLRegionDetails mRegionDetails; - + + void clearBalance() { mBalance = 0; } private: static void onCommitSearch(LLUICtrl*, void* data); static void onClickSearch(void* data); -- cgit v1.1