From 69391625ebf53a8ee797b268ee6aef7303bea6af Mon Sep 17 00:00:00 2001
From: Seraph Linden <none@none>
Date: Mon, 30 May 2011 13:53:49 -0400
Subject: [PATCH] SH-1677 FIXED [REGRESSION] Bulk uploads do not adhere to
default permissions
no idea how this ever worked before, as the code since 1.23 has been using the wrong keyword ("everyone_mask" instead of "new_everyone_mask"). I suspect something changed on the sim side?
---
indra/newview/llassetuploadresponders.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp
index c08771c5e7d..d7ba4ea4706 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;
--
GitLab