diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2014-03-18 17:11:39 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2014-03-18 17:11:39 +0200 |
| commit | 782a7e267cd42af4f60fa5e2984823d88fbb27de (patch) | |
| tree | 8a68fcf36a28d9af9788bf032a8e40ea65737ad2 /indra | |
| parent | c73d3073040d7f9731fd94eb51499d90fad6572a (diff) | |
MAINT-2578 FIXED Resident can add nonexistent resident to IM or add-hoc conference in "Choose resident" floater
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llfloateravatarpicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index c0afb72cff..1b0e73409b 100755 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -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 { |