summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateravatarpicker.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-01 15:54:02 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-05-01 15:54:02 -0400
commit7731b1e5427d635b7c18320cb8846356e1b93496 (patch)
tree9e5bd33d23c23c1e45f5d092ca1c433a3b10c063 /indra/newview/llfloateravatarpicker.cpp
parentb322c1dbaceaa9359243e030a125e312c54448f3 (diff)
parent1beb15c93b139e4494bb90cce30b1c67accb4b08 (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;
+ }
}
}