Skip to content
Snippets Groups Projects
Commit b64ef2ec authored by Monty Brandenberg's avatar Monty Brandenberg
Browse files

Fix ambiguous constructor due to LLSD access which broke *ix builds.

parent 85cba58a
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
indra/newview/llinventorymodelbackgroundfetch.cpp
+ 2
− 2
View file @ b64ef2ec
...@@ -870,7 +870,7 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http ...@@ -870,7 +870,7 @@ void BGFolderHttpHandler::processFailure(LLCore::HttpStatus status, LLCore::Http
++folder_it) ++folder_it)
{ {
LLSD folder_sd(*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); const BOOL recursive = getIsRecursive(folder_id);
fetcher->addRequestAtFront(folder_id, recursive, true); fetcher->addRequestAtFront(folder_id, recursive, true);
} }
...@@ -900,7 +900,7 @@ void BGFolderHttpHandler::processFailure(const char * const reason, LLCore::Http ...@@ -900,7 +900,7 @@ void BGFolderHttpHandler::processFailure(const char * const reason, LLCore::Http
++folder_it) ++folder_it)
{ {
LLSD folder_sd(*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); const BOOL recursive = getIsRecursive(folder_id);
fetcher->addRequestAtFront(folder_id, recursive, true); fetcher->addRequestAtFront(folder_id, recursive, true);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment