From b64ef2ecd4af5265483527f2ef030554133ab137 Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Fri, 22 Aug 2014 19:00:11 -0400
Subject: [PATCH] Fix ambiguous constructor due to LLSD access which broke *ix
builds.
---
indra/newview/llinventorymodelbackgroundfetch.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 443c54df421..7b944edf457 100755
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -870,7 +870,7 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
++folder_it)
{
LLSD folder_sd(*folder_it);
- LLUUID folder_id(folder_sd["folder_id"]);
+ LLUUID folder_id(folder_sd["folder_id"].asUUID());
const BOOL recursive = getIsRecursive(folder_id);
fetcher->addRequestAtFront(folder_id, recursive, true);
}
@@ -900,7 +900,7 @@ void BGFolderHttpHandler::processFailure(const char * const reason, LLCore::Http
++folder_it)
{
LLSD folder_sd(*folder_it);
- LLUUID folder_id(folder_sd["folder_id"]);
+ LLUUID folder_id(folder_sd["folder_id"].asUUID());
const BOOL recursive = getIsRecursive(folder_id);
fetcher->addRequestAtFront(folder_id, recursive, true);
}
--
GitLab