diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-01-12 21:30:03 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-01-12 21:30:03 +0200 |
| commit | 2db3e7d5c9638628228a6ea988c21ffa81ba890e (patch) | |
| tree | b9f1fac0fa7da05f481532fe0da869b637f01e15 /indra/newview | |
| parent | 6df80ebcc4b547d3728ed5fca6fa4efa899f30ea (diff) | |
| parent | 3892685922c4a64d05f98ba12c55fe6e5bc26497 (diff) | |
Merged lindenlab/viewer-bear into default
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfavoritesbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 8d48ce69ea..efabcf6056 100755 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -1623,7 +1623,7 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser() { LLSD user_llsd = fav_llsd[av_name.getUserName()]; - if (user_llsd.beginArray()->has("id")) + if ((user_llsd.beginArray()!= user_llsd.endArray()) && user_llsd.beginArray()->has("id")) { for (LLSD::array_iterator iter = user_llsd.beginArray();iter != user_llsd.endArray(); ++iter) { |