diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-08-22 19:00:11 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-08-22 19:00:11 -0400 |
| commit | b64ef2ecd4af5265483527f2ef030554133ab137 (patch) | |
| tree | 67e5f05e8c6732a0e76c7ad5736de4e4aa5bb9f1 /indra/newview | |
| parent | 85cba58ad473ed28efda7f645af20d56229e8637 (diff) | |
Fix ambiguous constructor due to LLSD access which broke *ix builds.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llinventorymodelbackgroundfetch.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 443c54df42..7b944edf45 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); } |