diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-24 19:10:43 -0800 |
commit | c2ca71322bf48653d466cba40bbe01c3401318c7 (patch) | |
tree | ecb9834f475c55dcf78c06aed115db69276068ef /indra/newview/llviewermessage.cpp | |
parent | a0de48f0ccf7ab8181651646036a13f712641b54 (diff) | |
parent | 433eb89473e9aaa3864299b7ba50a320f14bba38 (diff) |
automated merge
Don't wanna fix all windows EOL issue here
warn-on-failure:unix-eol
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
-rw-r--r-- | indra/newview/llviewermessage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5861033088..f707cb9b93 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -51,7 +51,7 @@ #include "llagent.h" #include "llcallingcard.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llfloaterbuycurrency.h" #include "llfloaterbuyland.h" #include "llfloaterchat.h" @@ -4335,10 +4335,10 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) if (gStatusBar) { - S32 old_balance = gStatusBar->getBalance(); + // S32 old_balance = gStatusBar->getBalance(); // This is an update, not the first transmission of balance - if (old_balance != 0) + /* if (old_balance != 0) { // this is actually an update if (balance > old_balance) @@ -4350,7 +4350,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** ) LLFirstUse::useBalanceDecrease(balance - old_balance); } } - + */ gStatusBar->setBalance(balance); gStatusBar->setLandCredit(credit); gStatusBar->setLandCommitted(committed); |