diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-06 13:01:56 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-06 13:01:56 -0400 |
| commit | 2a59fef6beff7144085ea98ede4a3b4300248d7f (patch) | |
| tree | 96ac7748d02e437de34639a51772af2040ce7170 /indra/newview/llfloateravatarpicker.cpp | |
| parent | f5e8457e4e4fad1d823c51d86c01fdc2ae08401c (diff) | |
| parent | 291b38717805f7de41af447c651c5b91352d0a51 (diff) | |
Merge. Pull from /lindenlab/viewer-cat prior to push.
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index 3e0e82b579..113aa9a8f2 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -818,7 +818,14 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled() uuid_vec_t avatar_ids; std::vector<LLAvatarName> avatar_names; getSelectedAvatarData(list, avatar_ids, avatar_names); - return mOkButtonValidateSignal(avatar_ids); + if (avatar_ids.size() >= 1) + { + ret_val = mOkButtonValidateSignal(avatar_ids); + } + else + { + ret_val = false; + } } } |