livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for contacts floater: use size_t when calling .size() and use real booleans where it makes sense

Ansariel 2014-07-18 14:03:39 +02:00
parent 8dfee097a1
commit aae467dbba
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/fsfloatercontacts.cpp
View File

@ -699,7 +699,7 @@ void FSFloaterContacts::refreshRightsChangeList()
uuid_vec_t friends;
getCurrentItemIDs(friends);
S32 num_selected = friends.size();
size_t num_selected = friends.size();
bool can_offer_teleport = num_selected >= 1;
bool selected_friends_online = true;
@ -733,8 +733,8 @@ void FSFloaterContacts::refreshRightsChangeList()
if (num_selected == 0) // nothing selected
{
childSetEnabled("im_btn", FALSE);
childSetEnabled("offer_teleport_btn", FALSE);
childSetEnabled("im_btn", false);
childSetEnabled("offer_teleport_btn", false);
}
else // we have at least one friend selected...
{
@ -750,16 +750,13 @@ void FSFloaterContacts::refreshUI()
{
sortFriendList();
BOOL single_selected = FALSE;
BOOL multiple_selected = FALSE;
int num_selected = mFriendsList->getAllSelected().size();
if(num_selected > 0)
bool single_selected = false;
bool multiple_selected = false;
size_t num_selected = mFriendsList->getAllSelected().size();
if (num_selected > 0)
{
single_selected = TRUE;
if(num_selected > 1)
{
multiple_selected = TRUE;
}
single_selected = true;
multiple_selected = (num_selected > 1);
}
//Options that can only be performed with one friend selected