diff options
author | Armin Weatherwax | 2010-10-01 22:23:50 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-10-01 22:23:50 +0200 |
commit | 1e3d134625c1e89ee3480f4159fa7d60b0438571 (patch) | |
tree | 4510402e3bbcfbcefe8f3891aa23e9ac77db47be /linden/indra | |
parent | replacent for f99376788 Fixed #381: using voice causes viewer crash on discon... (diff) | |
download | meta-impy-1e3d134625c1e89ee3480f4159fa7d60b0438571.zip meta-impy-1e3d134625c1e89ee3480f4159fa7d60b0438571.tar.gz meta-impy-1e3d134625c1e89ee3480f4159fa7d60b0438571.tar.bz2 meta-impy-1e3d134625c1e89ee3480f4159fa7d60b0438571.tar.xz |
fix: don't play balance changed ui-sound when relogging into account with different balance
Diffstat (limited to 'linden/indra')
-rw-r--r-- | linden/indra/newview/llappviewer.cpp | 4 | ||||
-rw-r--r-- | linden/indra/newview/llstatusbar.h | 3 |
2 files changed, 6 insertions, 1 deletions
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() | |||
1191 | LLAvatarTracker::instance().reset(); | 1191 | LLAvatarTracker::instance().reset(); |
1192 | } | 1192 | } |
1193 | 1193 | ||
1194 | //reset balance for not playing the UI-Sound | ||
1195 | //when relogging into another account | ||
1196 | gStatusBar->clearBalance(); | ||
1197 | |||
1194 | if (mQuitRequested) | 1198 | if (mQuitRequested) |
1195 | { | 1199 | { |
1196 | display_cleanup(); | 1200 | 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: | |||
121 | S32 getSquareMetersCommitted() const; | 121 | S32 getSquareMetersCommitted() const; |
122 | S32 getSquareMetersLeft() const; | 122 | S32 getSquareMetersLeft() const; |
123 | LLRegionDetails mRegionDetails; | 123 | LLRegionDetails mRegionDetails; |
124 | 124 | ||
125 | void clearBalance() { mBalance = 0; } | ||
125 | private: | 126 | private: |
126 | static void onCommitSearch(LLUICtrl*, void* data); | 127 | static void onCommitSearch(LLUICtrl*, void* data); |
127 | static void onClickSearch(void* data); | 128 | static void onClickSearch(void* data); |