diff options
| author | Nyx Linden <nyx@lindenlab.com> | 2013-04-17 19:20:42 -0400 |
|---|---|---|
| committer | Nyx Linden <nyx@lindenlab.com> | 2013-04-17 19:20:42 -0400 |
| commit | 490edf41ebb91adcc127bd21463772eb17baad8b (patch) | |
| tree | cc53c423a20348026f41529772ef63e441ba341c | |
| parent | 82be384d35907602a112b148a746fa873f474e4a (diff) | |
BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker
Added checks to validate that the selection list is non-empty
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/llfloateravatarpicker.cpp | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 32dd3c1a2e..a63e3a22b0 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -299,6 +299,7 @@ ChickyBabes Zuzu Christopher Organiser Ciaran Laval Cinder Roxley + BUG-2326 STORM-1703 Clara Young Coaldust Numbers 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; + } } } |