summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2016-01-12 15:48:00 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2016-01-12 15:48:00 +0200
commit3892685922c4a64d05f98ba12c55fe6e5bc26497 (patch)
tree9c5eafc74e51c16f5654180355b881b8039de160
parent579ed3849a5b5e2d1875c1232eab44ee2f9fe7ea (diff)
MAINT-6040 FIXED crash in LLFavoritesOrderStorage
-rwxr-xr-xindra/newview/llfavoritesbar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp
index d6b86cd746..b779d8f461 100755
--- a/indra/newview/llfavoritesbar.cpp
+++ b/indra/newview/llfavoritesbar.cpp
@@ -1622,7 +1622,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)
{