Skip to content
Snippets Groups Projects
Commit 782a7e26 authored by andreykproductengine's avatar andreykproductengine
Browse files

MAINT-2578 FIXED Resident can add nonexistent resident to IM or add-hoc...

MAINT-2578 FIXED Resident can add nonexistent resident to IM or add-hoc conference in "Choose resident" floater
parent c73d3073
No related branches found
No related tags found
No related merge requests found
...@@ -795,7 +795,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled() ...@@ -795,7 +795,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled()
{ {
bool ret_val = visibleItemsSelected(); bool ret_val = visibleItemsSelected();
if ( ret_val && mOkButtonValidateSignal.num_slots() ) if ( ret_val )
{ {
std::string acvtive_panel_name; std::string acvtive_panel_name;
LLScrollListCtrl* list = NULL; LLScrollListCtrl* list = NULL;
...@@ -826,7 +826,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled() ...@@ -826,7 +826,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled()
getSelectedAvatarData(list, avatar_ids, avatar_names); getSelectedAvatarData(list, avatar_ids, avatar_names);
if (avatar_ids.size() >= 1) if (avatar_ids.size() >= 1)
{ {
ret_val = mOkButtonValidateSignal(avatar_ids); ret_val = mOkButtonValidateSignal.num_slots()?mOkButtonValidateSignal(avatar_ids):true;
} }
else else
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment