summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterbuycontents.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/llfloaterbuycontents.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/llfloaterbuycontents.cpp')
-rw-r--r--indra/newview/llfloaterbuycontents.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index 0b3df52e07..a09ebbfab4 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -75,7 +75,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
sInstance = new LLFloaterBuyContents();
}
- sInstance->open();
+ sInstance->open(); /*Flawfinder: ignore*/
sInstance->setFocus(TRUE);
// Always center the dialog. User can change the size,
@@ -100,7 +100,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
if (!node) return;
if(node->mPermissions->isGroupOwned())
{
- char group_name[MAX_STRING];
+ char group_name[MAX_STRING]; /*Flawfinder: ignore*/
gCacheName->getGroupName(owner_id, group_name);
owner_name.assign(group_name);
}