aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermessage.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-10-08 12:27:10 -0700
committerMcCabe Maxsted2009-10-08 12:27:10 -0700
commit9c3fb16e3a90d57ec527d90ae26e686b893e75c7 (patch)
treecb948529e5cc3fae013f2bfa33d7665188643f56 /linden/indra/newview/llviewermessage.cpp
parentFixed stupid error on my part that broke clickable names in chat history (diff)
downloadmeta-impy-9c3fb16e3a90d57ec527d90ae26e686b893e75c7.zip
meta-impy-9c3fb16e3a90d57ec527d90ae26e686b893e75c7.tar.gz
meta-impy-9c3fb16e3a90d57ec527d90ae26e686b893e75c7.tar.bz2
meta-impy-9c3fb16e3a90d57ec527d90ae26e686b893e75c7.tar.xz
Fixed money change notification happening after logout/login
Diffstat (limited to 'linden/indra/newview/llviewermessage.cpp')
-rw-r--r--linden/indra/newview/llviewermessage.cpp2
1 files changed, 1 insertions, 1 deletions
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** )
4419 LLUUID tid; 4419 LLUUID tid;
4420 msg->getUUID("MoneyData", "TransactionID", tid); 4420 msg->getUUID("MoneyData", "TransactionID", tid);
4421 static std::deque<LLUUID> recent; 4421 static std::deque<LLUUID> recent;
4422 if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange") 4422 if(!desc.empty() && gSavedSettings.getBOOL("NotifyMoneyChange") && !gDisconnected
4423 && (std::find(recent.rbegin(), recent.rend(), tid) == recent.rend())) 4423 && (std::find(recent.rbegin(), recent.rend(), tid) == recent.rend()))
4424 { 4424 {
4425 // Make the user confirm the transaction, since they might 4425 // Make the user confirm the transaction, since they might