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

MAINT-2578 FIXED Resident can add nonexistent resident to IM or add-hoc conference in "Choose resident" floater

meow-7.2.2
andreykproductengine 2014-03-18 17:11:39 +02:00
parent c73d307304
commit 782a7e267c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloateravatarpicker.cpp
View File

@ -795,7 +795,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled()
{
bool ret_val = visibleItemsSelected();
if ( ret_val && mOkButtonValidateSignal.num_slots() )
if ( ret_val )
{
std::string acvtive_panel_name;
LLScrollListCtrl* list = NULL;
@ -826,7 +826,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled()
getSelectedAvatarData(list, avatar_ids, avatar_names);
if (avatar_ids.size() >= 1)
{
ret_val = mOkButtonValidateSignal(avatar_ids);
ret_val = mOkButtonValidateSignal.num_slots()?mOkButtonValidateSignal(avatar_ids):true;
}
else
{