diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-02-20 22:02:36 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-02-20 22:02:36 +0000 |
| commit | 7dada07dbaae3dfb9b1319453e51019bfff2717f (patch) | |
| tree | a7f2b84ea65c39cee31474640dd5f265c0b2f432 /indra/newview/llstartup.cpp | |
| parent | 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 (diff) | |
svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 7bd6c9ad82..fc95ebd067 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -63,7 +63,6 @@ #include "lleventnotifier.h" #include "llface.h" #include "llfeaturemanager.h" -#include "llfloateraccounthistory.h" #include "llfloaterchat.h" #include "llfloatergesture.h" #include "llfloaterland.h" @@ -2287,11 +2286,11 @@ BOOL idle_startup() // JC - 7/20/2002 gViewerWindow->sendShapeToSim(); + // Ignore stipend information for now. Money history is on the web site. // if needed, show the money history window - if (stipend_since_login && !gNoRender) - { - LLFloaterAccountHistory::show(NULL); - } + //if (stipend_since_login && !gNoRender) + //{ + //} if (!gAgent.isFirstLogin()) { @@ -3125,14 +3124,6 @@ void register_viewer_callbacks(LLMessageSystem* msg) msg->setHandlerFuncFast(_PREHASH_GrantGodlikePowers, process_grant_godlike_powers); - msg->setHandlerFuncFast(_PREHASH_MoneySummaryReply, - LLFloaterAccountHistory::processMoneySummaryReply); - msg->setHandlerFuncFast(_PREHASH_MoneyDetailsReply, - LLFloaterAccountHistory::processMoneyDetailsReply); - msg->setHandlerFuncFast(_PREHASH_MoneyTransactionsReply, - LLFloaterAccountHistory::processMoneyTransactionsReply); - - // ASDF msg->setHandlerFuncFast(_PREHASH_GroupAccountSummaryReply, LLGroupMoneyPlanningTabEventHandler::processGroupAccountSummaryReply); msg->setHandlerFuncFast(_PREHASH_GroupAccountDetailsReply, |