diff options
author | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-06-05 19:08:35 -0700 |
commit | 702bd5107a71aa3ac7c779a1e2ff0eaa53161e13 (patch) | |
tree | feca9cc804b88e4f1b78a811ae7af359c67e5455 /indra/newview/llpanelgrouplandmoney.cpp | |
parent | 6cf85d1bf3eae2d2d798b756100c048ec2b1c411 (diff) | |
parent | e1d96d72692d70f7e16fb93d6ef1d42c89d26409 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/newview/llpanelgrouplandmoney.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/newview/llpanelgrouplandmoney.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index 37755fb851..c927aeacb3 100644..100755 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -1383,13 +1383,11 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, S32 cur_land_tax; S32 cur_group_tax; S32 cur_parcel_dir_fee; - S32 cur_total_tax; S32 proj_object_tax; S32 proj_light_tax; S32 proj_land_tax; S32 proj_group_tax; S32 proj_parcel_dir_fee; - S32 proj_total_tax; S32 non_exempt_members; msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days ); @@ -1413,8 +1411,6 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date); msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date); - cur_total_tax = cur_object_tax + cur_light_tax + cur_land_tax + cur_group_tax + cur_parcel_dir_fee; - proj_total_tax = proj_object_tax + proj_light_tax + proj_land_tax + proj_group_tax + proj_parcel_dir_fee; if (interval_days != mImplementationp->mIntervalLength || current_interval != mImplementationp->mCurrentInterval) |