aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelgrouplandmoney.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-06-07 23:14:43 -0700
committerMcCabe Maxsted2009-06-07 23:14:43 -0700
commite0a70bea805cf07b92efabca15ffe56a777f90ac (patch)
tree2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llpanelgrouplandmoney.cpp
parent1.1 version final (diff)
parentMerge branch 'sl-base-1.22' into next (diff)
downloadmeta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2
meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/llpanelgrouplandmoney.cpp')
-rw-r--r--linden/indra/newview/llpanelgrouplandmoney.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index b8c9e69..51bdbdc 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -4,7 +4,7 @@
4 * 4 *
5 * $LicenseInfo:firstyear=2006&license=viewergpl$ 5 * $LicenseInfo:firstyear=2006&license=viewergpl$
6 * 6 *
7 * Copyright (c) 2006-2008, Linden Research, Inc. 7 * Copyright (c) 2006-2009, Linden Research, Inc.
8 * 8 *
9 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
10 * The source code in this file ("Source Code") is provided by Linden Lab 10 * The source code in this file ("Source Code") is provided by Linden Lab
@@ -705,12 +705,13 @@ BOOL LLPanelGroupLandMoney::postBuild()
705 textp = getChild<LLTextEditor>("group_money_planning_text", true); 705 textp = getChild<LLTextEditor>("group_money_planning_text", true);
706 panelp = getChild<LLPanel>("group_money_planning_tab", true); 706 panelp = getChild<LLPanel>("group_money_planning_tab", true);
707 707
708 if ( !can_view ) 708 if ( 1 ) //!can_view
709 { 709 {
710 textp->setText(mImplementationp->mCantViewAccountsText); 710 textp->setText(mImplementationp->mCantViewAccountsText);
711 } 711 }
712 else 712 else
713 { 713 {
714 //Temporally disabled for DEV-11287.
714 mImplementationp->mMoneyPlanningTabEHp = 715 mImplementationp->mMoneyPlanningTabEHp =
715 new LLGroupMoneyPlanningTabEventHandler(textp, 716 new LLGroupMoneyPlanningTabEventHandler(textp,
716 tabcp, 717 tabcp,