diff options
| author | simon <none@none> | 2013-04-29 12:05:44 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-04-29 12:05:44 -0700 |
| commit | 5af5b49a6205c34b8787cd4ecb4bd1d94174663f (patch) | |
| tree | d05b54a5d7ef981867a150279f8b573d2f9198ed /indra/newview/llfloateravatarpicker.cpp | |
| parent | b458923ea430880934f7fcc38a3e99e678e79b11 (diff) | |
| parent | 0bc7056ae6b314fac508f2c417cc5818107cb72e (diff) | |
Merge in downstream viewer-beta
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; + } } } |