diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelgrouplandmoney.cpp | 73 |
1 files changed, 29 insertions, 44 deletions
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp index 483aff1..7cfe460 100644 --- a/linden/indra/newview/llpanelgrouplandmoney.cpp +++ b/linden/indra/newview/llpanelgrouplandmoney.cpp | |||
@@ -60,7 +60,7 @@ public: | |||
60 | LLGroupMoneyTabEventHandler(LLButton* earlier_button, | 60 | LLGroupMoneyTabEventHandler(LLButton* earlier_button, |
61 | LLButton* later_button, | 61 | LLButton* later_button, |
62 | LLTextEditor* text_editor, | 62 | LLTextEditor* text_editor, |
63 | LLTabContainerCommon* tab_containerp, | 63 | LLTabContainer* tab_containerp, |
64 | LLPanel* panelp, | 64 | LLPanel* panelp, |
65 | const LLString& loading_text, | 65 | const LLString& loading_text, |
66 | const LLUUID& group_id, | 66 | const LLUUID& group_id, |
@@ -92,7 +92,7 @@ public: | |||
92 | LLGroupMoneyDetailsTabEventHandler(LLButton* earlier_buttonp, | 92 | LLGroupMoneyDetailsTabEventHandler(LLButton* earlier_buttonp, |
93 | LLButton* later_buttonp, | 93 | LLButton* later_buttonp, |
94 | LLTextEditor* text_editorp, | 94 | LLTextEditor* text_editorp, |
95 | LLTabContainerCommon* tab_containerp, | 95 | LLTabContainer* tab_containerp, |
96 | LLPanel* panelp, | 96 | LLPanel* panelp, |
97 | const LLString& loading_text, | 97 | const LLString& loading_text, |
98 | const LLUUID& group_id); | 98 | const LLUUID& group_id); |
@@ -109,7 +109,7 @@ public: | |||
109 | LLGroupMoneySalesTabEventHandler(LLButton* earlier_buttonp, | 109 | LLGroupMoneySalesTabEventHandler(LLButton* earlier_buttonp, |
110 | LLButton* later_buttonp, | 110 | LLButton* later_buttonp, |
111 | LLTextEditor* text_editorp, | 111 | LLTextEditor* text_editorp, |
112 | LLTabContainerCommon* tab_containerp, | 112 | LLTabContainer* tab_containerp, |
113 | LLPanel* panelp, | 113 | LLPanel* panelp, |
114 | const LLString& loading_text, | 114 | const LLString& loading_text, |
115 | const LLUUID& group_id); | 115 | const LLUUID& group_id); |
@@ -123,7 +123,7 @@ class LLGroupMoneyPlanningTabEventHandler : public LLGroupMoneyTabEventHandler | |||
123 | { | 123 | { |
124 | public: | 124 | public: |
125 | LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editor, | 125 | LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editor, |
126 | LLTabContainerCommon* tab_containerp, | 126 | LLTabContainer* tab_containerp, |
127 | LLPanel* panelp, | 127 | LLPanel* panelp, |
128 | const LLString& loading_text, | 128 | const LLString& loading_text, |
129 | const LLUUID& group_id); | 129 | const LLUUID& group_id); |
@@ -311,7 +311,6 @@ void LLPanelGroupLandMoney::impl::setYourContributionTextField(int contrib) | |||
311 | if ( mYourContributionEditorp ) | 311 | if ( mYourContributionEditorp ) |
312 | { | 312 | { |
313 | mYourContributionEditorp->setText(buffer); | 313 | mYourContributionEditorp->setText(buffer); |
314 | mYourContributionEditorp->draw(); | ||
315 | } | 314 | } |
316 | } | 315 | } |
317 | 316 | ||
@@ -501,7 +500,7 @@ void LLPanelGroupLandMoney::activate() | |||
501 | if ( !mImplementationp->mBeenActivated ) | 500 | if ( !mImplementationp->mBeenActivated ) |
502 | { | 501 | { |
503 | //select the first tab | 502 | //select the first tab |
504 | LLTabContainerCommon* tabp = (LLTabContainerCommon*) getChildByName("group_money_tab_container"); | 503 | LLTabContainer* tabp = getChild<LLTabContainer>("group_money_tab_container"); |
505 | 504 | ||
506 | if ( tabp ) | 505 | if ( tabp ) |
507 | { | 506 | { |
@@ -541,7 +540,7 @@ void LLPanelGroupLandMoney::update(LLGroupChange gc) | |||
541 | { | 540 | { |
542 | if (gc != GC_ALL) return; //Don't update if it's the wrong panel! | 541 | if (gc != GC_ALL) return; //Don't update if it's the wrong panel! |
543 | 542 | ||
544 | LLTabContainerCommon* tabp = (LLTabContainerCommon*) getChildByName("group_money_tab_container"); | 543 | LLTabContainer* tabp = getChild<LLTabContainer>("group_money_tab_container"); |
545 | 544 | ||
546 | if ( tabp ) | 545 | if ( tabp ) |
547 | { | 546 | { |
@@ -605,12 +604,12 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
605 | bool can_view = gAgent.isInGroup(mGroupID); | 604 | bool can_view = gAgent.isInGroup(mGroupID); |
606 | 605 | ||
607 | mImplementationp->mGroupOverLimitIconp = | 606 | mImplementationp->mGroupOverLimitIconp = |
608 | (LLIconCtrl*) getChildByName("group_over_limit_icon"); | 607 | getChild<LLIconCtrl>("group_over_limit_icon"); |
609 | mImplementationp->mGroupOverLimitTextp = | 608 | mImplementationp->mGroupOverLimitTextp = |
610 | (LLTextBox*) getChildByName("group_over_limit_text"); | 609 | getChild<LLTextBox>("group_over_limit_text"); |
611 | 610 | ||
612 | mImplementationp->mYourContributionEditorp | 611 | mImplementationp->mYourContributionEditorp |
613 | = (LLLineEditor*) getChildByName("your_contribution_line_editor"); | 612 | = getChild<LLLineEditor>("your_contribution_line_editor"); |
614 | if ( mImplementationp->mYourContributionEditorp ) | 613 | if ( mImplementationp->mYourContributionEditorp ) |
615 | { | 614 | { |
616 | LLLineEditor* editor = mImplementationp->mYourContributionEditorp; | 615 | LLLineEditor* editor = mImplementationp->mYourContributionEditorp; |
@@ -620,26 +619,13 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
620 | editor->setCallbackUserData(this); | 619 | editor->setCallbackUserData(this); |
621 | } | 620 | } |
622 | 621 | ||
623 | mImplementationp->mMapButtonp = (LLButton*) getChildByName("map_button"); | 622 | mImplementationp->mMapButtonp = getChild<LLButton>("map_button"); |
624 | 623 | ||
625 | mImplementationp->mGroupParcelsp = | 624 | mImplementationp->mGroupParcelsp = |
626 | (LLScrollListCtrl*) getChildByName("group_parcel_list"); | 625 | getChild<LLScrollListCtrl>("group_parcel_list"); |
627 | |||
628 | LLTextBox *no_permsp = | ||
629 | (LLTextBox*) getChildByName("cant_view_group_land_text"); | ||
630 | if ( no_permsp ) | ||
631 | { | ||
632 | mImplementationp->mCantViewParcelsText = no_permsp->getText(); | ||
633 | removeChild(no_permsp, TRUE); | ||
634 | } | ||
635 | |||
636 | no_permsp = (LLTextBox*) getChildByName("cant_view_group_accounting_text"); | ||
637 | if ( no_permsp ) | ||
638 | { | ||
639 | mImplementationp->mCantViewAccountsText = no_permsp->getText(); | ||
640 | removeChild(no_permsp, TRUE); | ||
641 | } | ||
642 | 626 | ||
627 | mImplementationp->mCantViewParcelsText = getString("cant_view_group_land_text"); | ||
628 | mImplementationp->mCantViewAccountsText = getString("cant_view_group_accounting_text"); | ||
643 | 629 | ||
644 | if ( mImplementationp->mMapButtonp ) | 630 | if ( mImplementationp->mMapButtonp ) |
645 | { | 631 | { |
@@ -677,8 +663,7 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
677 | LLTextEditor* textp; | 663 | LLTextEditor* textp; |
678 | LLPanel* panelp; | 664 | LLPanel* panelp; |
679 | 665 | ||
680 | LLTabContainerCommon* tabcp = (LLTabContainerCommon*) | 666 | LLTabContainer* tabcp = getChild<LLTabContainer>("group_money_tab_container"); |
681 | getChildByName("group_money_tab_container", true); | ||
682 | 667 | ||
683 | if ( !can_view ) | 668 | if ( !can_view ) |
684 | { | 669 | { |
@@ -694,13 +679,13 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
694 | } | 679 | } |
695 | } | 680 | } |
696 | 681 | ||
697 | LLString loading_text = childGetText("loading_txt"); | 682 | LLString loading_text = getString("loading_txt"); |
698 | 683 | ||
699 | //pull out the widgets for the L$ details tab | 684 | //pull out the widgets for the L$ details tab |
700 | earlierp = (LLButton*) getChildByName("earlier_details_button", true); | 685 | earlierp = getChild<LLButton>("earlier_details_button", true); |
701 | laterp = (LLButton*) getChildByName("later_details_button", true); | 686 | laterp = getChild<LLButton>("later_details_button", true); |
702 | textp = (LLTextEditor*) getChildByName("group_money_details_text", true); | 687 | textp = getChild<LLTextEditor>("group_money_details_text", true); |
703 | panelp = (LLPanel*) getChildByName("group_money_details_tab", true); | 688 | panelp = getChild<LLPanel>("group_money_details_tab", true); |
704 | 689 | ||
705 | if ( !can_view ) | 690 | if ( !can_view ) |
706 | { | 691 | { |
@@ -718,8 +703,8 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
718 | mGroupID); | 703 | mGroupID); |
719 | } | 704 | } |
720 | 705 | ||
721 | textp = (LLTextEditor*) getChildByName("group_money_planning_text", true); | 706 | textp = getChild<LLTextEditor>("group_money_planning_text", true); |
722 | panelp = (LLPanel*) getChildByName("group_money_planning_tab", true); | 707 | panelp = getChild<LLPanel>("group_money_planning_tab", true); |
723 | 708 | ||
724 | if ( !can_view ) | 709 | if ( !can_view ) |
725 | { | 710 | { |
@@ -736,10 +721,10 @@ BOOL LLPanelGroupLandMoney::postBuild() | |||
736 | } | 721 | } |
737 | 722 | ||
738 | //pull out the widgets for the L$ sales tab | 723 | //pull out the widgets for the L$ sales tab |
739 | earlierp = (LLButton*) getChildByName("earlier_sales_button", true); | 724 | earlierp = getChild<LLButton>("earlier_sales_button", true); |
740 | laterp = (LLButton*) getChildByName("later_sales_button", true); | 725 | laterp = getChild<LLButton>("later_sales_button", true); |
741 | textp = (LLTextEditor*) getChildByName("group_money_sales_text", true); | 726 | textp = getChild<LLTextEditor>("group_money_sales_text", true); |
742 | panelp = (LLPanel*) getChildByName("group_money_sales_tab", true); | 727 | panelp = getChild<LLPanel>("group_money_sales_tab", true); |
743 | 728 | ||
744 | if ( !can_view ) | 729 | if ( !can_view ) |
745 | { | 730 | { |
@@ -881,7 +866,7 @@ std::map<LLPanel*, LLGroupMoneyTabEventHandler*> LLGroupMoneyTabEventHandler::sT | |||
881 | LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_buttonp, | 866 | LLGroupMoneyTabEventHandler::LLGroupMoneyTabEventHandler(LLButton* earlier_buttonp, |
882 | LLButton* later_buttonp, | 867 | LLButton* later_buttonp, |
883 | LLTextEditor* text_editorp, | 868 | LLTextEditor* text_editorp, |
884 | LLTabContainerCommon* tab_containerp, | 869 | LLTabContainer* tab_containerp, |
885 | LLPanel* panelp, | 870 | LLPanel* panelp, |
886 | const LLString& loading_text, | 871 | const LLString& loading_text, |
887 | const LLUUID& group_id, | 872 | const LLUUID& group_id, |
@@ -998,7 +983,7 @@ void LLGroupMoneyTabEventHandler::clickTabCallback(void* data, bool from_click) | |||
998 | LLGroupMoneyDetailsTabEventHandler::LLGroupMoneyDetailsTabEventHandler(LLButton* earlier_buttonp, | 983 | LLGroupMoneyDetailsTabEventHandler::LLGroupMoneyDetailsTabEventHandler(LLButton* earlier_buttonp, |
999 | LLButton* later_buttonp, | 984 | LLButton* later_buttonp, |
1000 | LLTextEditor* text_editorp, | 985 | LLTextEditor* text_editorp, |
1001 | LLTabContainerCommon* tab_containerp, | 986 | LLTabContainer* tab_containerp, |
1002 | LLPanel* panelp, | 987 | LLPanel* panelp, |
1003 | const LLString& loading_text, | 988 | const LLString& loading_text, |
1004 | const LLUUID& group_id) | 989 | const LLUUID& group_id) |
@@ -1138,7 +1123,7 @@ void LLPanelGroupLandMoney::processGroupAccountDetailsReply(LLMessageSystem* msg | |||
1138 | LLGroupMoneySalesTabEventHandler::LLGroupMoneySalesTabEventHandler(LLButton* earlier_buttonp, | 1123 | LLGroupMoneySalesTabEventHandler::LLGroupMoneySalesTabEventHandler(LLButton* earlier_buttonp, |
1139 | LLButton* later_buttonp, | 1124 | LLButton* later_buttonp, |
1140 | LLTextEditor* text_editorp, | 1125 | LLTextEditor* text_editorp, |
1141 | LLTabContainerCommon* tab_containerp, | 1126 | LLTabContainer* tab_containerp, |
1142 | LLPanel* panelp, | 1127 | LLPanel* panelp, |
1143 | const LLString& loading_text, | 1128 | const LLString& loading_text, |
1144 | const LLUUID& group_id) | 1129 | const LLUUID& group_id) |
@@ -1315,7 +1300,7 @@ void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem | |||
1315 | //*************************************************** | 1300 | //*************************************************** |
1316 | 1301 | ||
1317 | LLGroupMoneyPlanningTabEventHandler::LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editorp, | 1302 | LLGroupMoneyPlanningTabEventHandler::LLGroupMoneyPlanningTabEventHandler(LLTextEditor* text_editorp, |
1318 | LLTabContainerCommon* tab_containerp, | 1303 | LLTabContainer* tab_containerp, |
1319 | LLPanel* panelp, | 1304 | LLPanel* panelp, |
1320 | const LLString& loading_text, | 1305 | const LLString& loading_text, |
1321 | const LLUUID& group_id) | 1306 | const LLUUID& group_id) |