From 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:50 -0500
Subject: Second Life viewer sources 1.14.0.0

---
 linden/indra/newview/llfloaterfriends.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'linden/indra/newview/llfloaterfriends.cpp')

diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp
index 207454b..8a36620 100644
--- a/linden/indra/newview/llfloaterfriends.cpp
+++ b/linden/indra/newview/llfloaterfriends.cpp
@@ -113,12 +113,12 @@ void LLFloaterFriends::show(void*)
 {
 	if(sInstance)
 	{
-		sInstance->open();
+		sInstance->open();	/*Flawfinder: ignore*/
 	}
 	else
 	{
 		LLFloaterFriends* self = new LLFloaterFriends;
-		self->open();
+		self->open(); /*Flawfinder: ignore*/
 	}
 }
 
@@ -505,12 +505,12 @@ void LLFloaterFriends::onClickIM(void* user_data)
 		{
 			LLUUID agent_id = ids[0];
 			const LLRelationship* info = LLAvatarTracker::instance().getBuddyInfo(agent_id);
-			char first[DB_FIRST_NAME_BUF_SIZE];
-			char last[DB_LAST_NAME_BUF_SIZE];
+			char first[DB_FIRST_NAME_BUF_SIZE];	/* Flawfinder: ignore */
+			char last[DB_LAST_NAME_BUF_SIZE];	/* Flawfinder: ignore */
 			if(info && gCacheName->getName(agent_id, first, last))
 			{
-				char buffer[MAX_STRING];
-				snprintf(buffer, MAX_STRING, "%s %s", first, last);
+				char buffer[MAX_STRING];	/* Flawfinder: ignore */
+				snprintf(buffer, MAX_STRING, "%s %s", first, last);	/* Flawfinder: ignore */
 				gIMView->setFloaterOpen(TRUE);
 				gIMView->addSession(
 					buffer,
@@ -537,8 +537,7 @@ void LLFloaterFriends::requestFriendship(const LLUUID& target_id, const LLString
 {
 	// HACK: folder id stored as "message"
 	LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-	std::string message = calling_card_folder_id.getString();
-
+	std::string message = calling_card_folder_id.asString();
 	send_improved_im(target_id,
 					 target_name.c_str(),
 					 message.c_str(),
@@ -598,8 +597,8 @@ void LLFloaterFriends::onClickRemove(void* user_data)
 		if(ids.size() == 1)
 		{
 			LLUUID agent_id = ids[0];
-			char first[DB_FIRST_NAME_BUF_SIZE];
-			char last[DB_LAST_NAME_BUF_SIZE];
+			char first[DB_FIRST_NAME_BUF_SIZE];		/*Flawfinder: ignore*/
+			char last[DB_LAST_NAME_BUF_SIZE];		/*Flawfinder: ignore*/
 			if(gCacheName->getName(agent_id, first, last))
 			{
 				args["[FIRST_NAME]"] = first;
@@ -671,8 +670,8 @@ void LLFloaterFriends::onClickModifyStatus(LLUICtrl* ctrl, void* user_data)
 		if(ids.size() == 1)
 		{
 			LLUUID agent_id = ids[0];
-			char first[DB_FIRST_NAME_BUF_SIZE];
-			char last[DB_LAST_NAME_BUF_SIZE];
+			char first[DB_FIRST_NAME_BUF_SIZE];		/*Flawfinder: ignore*/
+			char last[DB_LAST_NAME_BUF_SIZE];		/*Flawfinder: ignore*/
 			if(gCacheName->getName(agent_id, first, last))
 			{
 				args["[FIRST_NAME]"] = first;
-- 
cgit v1.1