summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateravatarpicker.cpp
diff options
context:
space:
mode:
authorNyx Linden <nyx@lindenlab.com>2013-05-02 14:48:47 -0400
committerNyx Linden <nyx@lindenlab.com>2013-05-02 14:48:47 -0400
commite5d23969b9ad75ca535182ccbe76ff2b80d00605 (patch)
tree3f7c27476a95da3a8a7eeffc228541a86a1eaaac /indra/newview/llfloateravatarpicker.cpp
parentaf1431731802320e241037486b8bff0003a4d827 (diff)
parent2f1f7c86bd7f366be5d5ccf64cf1af1300bc57a0 (diff)
merge
Diffstat (limited to 'indra/newview/llfloateravatarpicker.cpp')
-rw-r--r--indra/newview/llfloateravatarpicker.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp
index 08f08a0cb0..0844a70e25 100644
--- a/indra/newview/llfloateravatarpicker.cpp
+++ b/indra/newview/llfloateravatarpicker.cpp
@@ -819,7 +819,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;
+ }
}
}