Fixed money change notification happening after logout/login

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 045583c..07701d5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2009-10-08 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Fixed money change notification happening after logout/login.
+        
+          modified:   linden/indra/newview/llviewermessage.cpp
+          
+          
         * Fixed entering sim notification being tied to radar range.
         
           modified:   linden/indra/newview/llfloatermap.cpp
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index c9e0f7f..88f6b36 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -4419,7 +4419,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
         LLUUID tid;
         msg->getUUID("MoneyData", "TransactionID", tid);
         static std::deque<LLUUID> recent;
-        if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange")
+        if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange") && !gDisconnected
            && (std::find(recent.rbegin(), recent.rend(), tid) == recent.rend()))
         {
                 // Make the user confirm the transaction, since they might