diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-04-18 15:59:22 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-04-18 15:59:22 -0700 |
| commit | eec08ef64c59fa7569c7418d40135d73338e1d8d (patch) | |
| tree | 3b62188c704df9ea16484c497d68388ab2908b80 /indra/newview/llfloateravatarpicker.cpp | |
| parent | 56badfe3498b5eeefb5c06c4b0d51eb1c62ded9c (diff) | |
| parent | ed2b5da8f1eb51e747f6d9f5a4fc535cbf7e69d9 (diff) | |
Merge with viewer-development
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; + } } } |