diff options
author | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 13:59:40 -0500 |
commit | 690f18c948003c9d14524da8cdf5b82da8227758 (patch) | |
tree | ff35e520c853e3f0005eb6e3bd61e0c659e9194e /indra/newview/llassetuploadresponders.cpp | |
parent | 0de24f857ac359e04d7def2afa7d8efe5a4cef97 (diff) | |
parent | 70f959f01e845b3a7b6211f82c20d0cbd6641c39 (diff) |
merge
Diffstat (limited to 'indra/newview/llassetuploadresponders.cpp')
-rw-r--r-- | indra/newview/llassetuploadresponders.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index c08771c5e7..d7ba4ea470 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -384,18 +384,18 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content) // Continuing the horrible hack above, we need to extract the originally requested permissions data, if any, // and use them for each next file to be uploaded. Note the requested perms are not the same as the U32 everyone_perms = - content.has("everyone_mask") ? - content["everyone_mask"].asInteger() : + content.has("new_everyone_mask") ? + content["new_everyone_mask"].asInteger() : PERM_NONE; U32 group_perms = - content.has("group_mask") ? - content["group_mask"].asInteger() : + content.has("new_group_mask") ? + content["new_group_mask"].asInteger() : PERM_NONE; U32 next_owner_perms = - content.has("next_owner_mask") ? - content["next_owner_mask"].asInteger() : + content.has("new_next_owner_mask") ? + content["new_next_owner_mask"].asInteger() : PERM_NONE; std::string display_name = LLStringUtil::null; |