diff options
| author | angela <angela@lindenlab.com> | 2010-01-14 13:02:44 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-01-14 13:02:44 +0800 |
| commit | 402d2e7c9d58852e63ca00fbb464433089b478e1 (patch) | |
| tree | 098d05eebfd7e14ce5048197789f6a9ec0624e5e /indra/newview/llviewermessage.cpp | |
| parent | 8a2404fa3341db0bd7a60459e008b8a3c6afad03 (diff) | |
| parent | 82b073be87e332b7653e442ef3fd84af7376da8e (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/james/gooey
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 4e5655274d..d93e2f0a14 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); |