Skip to content
Snippets Groups Projects
Commit 490edf41 authored by Nyx Linden's avatar Nyx Linden
Browse files

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
parent 82be384d
No related branches found
No related tags found
No related merge requests found
...@@ -299,6 +299,7 @@ ChickyBabes Zuzu ...@@ -299,6 +299,7 @@ ChickyBabes Zuzu
Christopher Organiser Christopher Organiser
Ciaran Laval Ciaran Laval
Cinder Roxley Cinder Roxley
BUG-2326
STORM-1703 STORM-1703
Clara Young Clara Young
Coaldust Numbers Coaldust Numbers
......
...@@ -818,7 +818,14 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled() ...@@ -818,7 +818,14 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled()
uuid_vec_t avatar_ids; uuid_vec_t avatar_ids;
std::vector<LLAvatarName> avatar_names; std::vector<LLAvatarName> avatar_names;
getSelectedAvatarData(list, avatar_ids, 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;
}
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment