summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroupgeneral.cpp
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-02-02 17:28:58 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-02-02 17:28:58 +0000
commit305c74d5163c5e344a675d39ca2394a9e45bd2c2 (patch)
tree42836c4a6010b2b015156024d3cfb6bf64a48ad6 /indra/newview/llpanelgroupgeneral.cpp
parent54d89549df38bb61881583a3eb8d3645c107d79f (diff)
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
Diffstat (limited to 'indra/newview/llpanelgroupgeneral.cpp')
-rw-r--r--indra/newview/llpanelgroupgeneral.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index c996354044..06a7598918 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -619,7 +619,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
}
if ( mBtnJoinGroup )
{
- char fee_buff[20];
+ char fee_buff[20]; /*Flawfinder: ignore*/
bool visible;
visible = !is_member && gdatap->mOpenEnrollment;
@@ -627,7 +627,7 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
if ( visible )
{
- sprintf(fee_buff, "Join (L$%d)", gdatap->mMembershipFee);
+ snprintf(fee_buff, sizeof(fee_buff), "Join (L$%d)", gdatap->mMembershipFee); /*Flawfinder: ignore*/
mBtnJoinGroup->setLabelSelected(std::string(fee_buff));
mBtnJoinGroup->setLabelUnselected(std::string(fee_buff));
}