diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterfriends.cpp | 23 |
1 files changed, 11 insertions, 12 deletions
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*) | |||
113 | { | 113 | { |
114 | if(sInstance) | 114 | if(sInstance) |
115 | { | 115 | { |
116 | sInstance->open(); | 116 | sInstance->open(); /*Flawfinder: ignore*/ |
117 | } | 117 | } |
118 | else | 118 | else |
119 | { | 119 | { |
120 | LLFloaterFriends* self = new LLFloaterFriends; | 120 | LLFloaterFriends* self = new LLFloaterFriends; |
121 | self->open(); | 121 | self->open(); /*Flawfinder: ignore*/ |
122 | } | 122 | } |
123 | } | 123 | } |
124 | 124 | ||
@@ -505,12 +505,12 @@ void LLFloaterFriends::onClickIM(void* user_data) | |||
505 | { | 505 | { |
506 | LLUUID agent_id = ids[0]; | 506 | LLUUID agent_id = ids[0]; |
507 | const LLRelationship* info = LLAvatarTracker::instance().getBuddyInfo(agent_id); | 507 | const LLRelationship* info = LLAvatarTracker::instance().getBuddyInfo(agent_id); |
508 | char first[DB_FIRST_NAME_BUF_SIZE]; | 508 | char first[DB_FIRST_NAME_BUF_SIZE]; /* Flawfinder: ignore */ |
509 | char last[DB_LAST_NAME_BUF_SIZE]; | 509 | char last[DB_LAST_NAME_BUF_SIZE]; /* Flawfinder: ignore */ |
510 | if(info && gCacheName->getName(agent_id, first, last)) | 510 | if(info && gCacheName->getName(agent_id, first, last)) |
511 | { | 511 | { |
512 | char buffer[MAX_STRING]; | 512 | char buffer[MAX_STRING]; /* Flawfinder: ignore */ |
513 | snprintf(buffer, MAX_STRING, "%s %s", first, last); | 513 | snprintf(buffer, MAX_STRING, "%s %s", first, last); /* Flawfinder: ignore */ |
514 | gIMView->setFloaterOpen(TRUE); | 514 | gIMView->setFloaterOpen(TRUE); |
515 | gIMView->addSession( | 515 | gIMView->addSession( |
516 | buffer, | 516 | buffer, |
@@ -537,8 +537,7 @@ void LLFloaterFriends::requestFriendship(const LLUUID& target_id, const LLString | |||
537 | { | 537 | { |
538 | // HACK: folder id stored as "message" | 538 | // HACK: folder id stored as "message" |
539 | LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD); | 539 | LLUUID calling_card_folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD); |
540 | std::string message = calling_card_folder_id.getString(); | 540 | std::string message = calling_card_folder_id.asString(); |
541 | |||
542 | send_improved_im(target_id, | 541 | send_improved_im(target_id, |
543 | target_name.c_str(), | 542 | target_name.c_str(), |
544 | message.c_str(), | 543 | message.c_str(), |
@@ -598,8 +597,8 @@ void LLFloaterFriends::onClickRemove(void* user_data) | |||
598 | if(ids.size() == 1) | 597 | if(ids.size() == 1) |
599 | { | 598 | { |
600 | LLUUID agent_id = ids[0]; | 599 | LLUUID agent_id = ids[0]; |
601 | char first[DB_FIRST_NAME_BUF_SIZE]; | 600 | char first[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ |
602 | char last[DB_LAST_NAME_BUF_SIZE]; | 601 | char last[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ |
603 | if(gCacheName->getName(agent_id, first, last)) | 602 | if(gCacheName->getName(agent_id, first, last)) |
604 | { | 603 | { |
605 | args["[FIRST_NAME]"] = first; | 604 | args["[FIRST_NAME]"] = first; |
@@ -671,8 +670,8 @@ void LLFloaterFriends::onClickModifyStatus(LLUICtrl* ctrl, void* user_data) | |||
671 | if(ids.size() == 1) | 670 | if(ids.size() == 1) |
672 | { | 671 | { |
673 | LLUUID agent_id = ids[0]; | 672 | LLUUID agent_id = ids[0]; |
674 | char first[DB_FIRST_NAME_BUF_SIZE]; | 673 | char first[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ |
675 | char last[DB_LAST_NAME_BUF_SIZE]; | 674 | char last[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ |
676 | if(gCacheName->getName(agent_id, first, last)) | 675 | if(gCacheName->getName(agent_id, first, last)) |
677 | { | 676 | { |
678 | args["[FIRST_NAME]"] = first; | 677 | args["[FIRST_NAME]"] = first; |