diff -r e4ef43d63d55 -r 401c15b6d0ac doc/contributions.txt --- a/doc/contributions.txt Sat Jun 04 08:03:12 2011 -0400 +++ b/doc/contributions.txt Sun Jun 05 11:09:05 2011 -0400 @@ -440,6 +440,7 @@ STORM-1095 STORM-1236 STORM-1259 + VWR-25896 Kage Pixel VWR-11 Ken March diff -r e4ef43d63d55 -r 401c15b6d0ac indra/newview/llassetuploadresponders.cpp --- a/indra/newview/llassetuploadresponders.cpp Sat Jun 04 08:03:12 2011 -0400 +++ b/indra/newview/llassetuploadresponders.cpp Sun Jun 05 11:09:05 2011 -0400 @@ -383,19 +383,20 @@ // 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 + // granted ones found in the given "content" structure but can still be found in mPostData. -MG U32 everyone_perms = - content.has("everyone_mask") ? - content["everyone_mask"].asInteger() : + mPostData.has("everyone_mask") ? + mPostData["everyone_mask"].asInteger() : PERM_NONE; U32 group_perms = - content.has("group_mask") ? - content["group_mask"].asInteger() : + mPostData.has("group_mask") ? + mPostData["group_mask"].asInteger() : PERM_NONE; U32 next_owner_perms = - content.has("next_owner_mask") ? - content["next_owner_mask"].asInteger() : + mPostData.has("next_owner_mask") ? + mPostData["next_owner_mask"].asInteger() : PERM_NONE; std::string display_name = LLStringUtil::null;