diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-07-22 18:23:48 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-07-22 18:23:48 -0700 |
| commit | f61671aec7a15160f906650b4c7449be68c7b074 (patch) | |
| tree | 1c8f08f04d137f41c5b8cbf9a579161ff0dd3538 /indra/newview/llfloateravatarpicker.cpp | |
| parent | 3d4acb535d75c4cc78c93dee318bcffaca691237 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Merged in release.
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
| -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 3e032d0e4a..513c33e60d 100755 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -796,7 +796,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; @@ -827,7 +827,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 { |