Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp
index 3c63ad69cb..65c5f5607e 100755
--- a/indra/newview/llfloatersellland.cpp
+++ b/indra/newview/llfloatersellland.cpp
@@ -78,7 +78,7 @@ void LLFloaterSellLand::sellLand(
 	LLFloaterSellLandUI* ui = LLFloaterSellLandUI::soleInstance(true);
 	if (ui->setParcel(region, parcel))
 	{
-		ui->open();
+		ui->open();		/* Flawfinder: ignore */
 	}
 }
 
@@ -186,8 +186,8 @@ void LLFloaterSellLandUI::updateParcelInfo()
 	if(mSellToBuyer)
 	{
 		LLString name;
-		char firstname[MAX_STRING];
-		char lastname[MAX_STRING];
+		char firstname[MAX_STRING];		/* Flawfinder: ignore */
+		char lastname[MAX_STRING];		/* Flawfinder: ignore */
 		gCacheName->getName(mAuthorizedBuyer, firstname, lastname);
 		name.assign(firstname);
 		name.append(" ");