diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-08-31 21:07:23 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-08-31 21:07:23 -0700 |
| commit | 97d52e2a3e3e4ac4ac9290e0541fb2a6ab1ecfbd (patch) | |
| tree | 5d592e264e9f5101d68c1d2bcc910906aa758716 | |
| parent | c24db314e547aafa734f852ec645d48e254cf9a9 (diff) | |
SNOW-680 VWR-10854 : Honour share with group and allow anyone to copy for snapshots
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llfloaterperms.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 6d93eca14c..8d77d15fe4 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -184,6 +184,7 @@ Carjay McGinnis Catherine Pfeffer VWR-1282 VWR-8624 + VWR-10854 Celierra Darling VWR-1274 VWR-6975 @@ -631,6 +632,7 @@ Teardrops Fall Techwolf Lupindo SNOW-92 SNOW-649 + SNOW-680 VWR-12385 tenebrous pau VWR-247 diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index bb851a349e..74dfede23e 100644 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -115,7 +115,7 @@ U32 LLFloaterPerms::getEveryonePerms(std::string prefix) //static U32 LLFloaterPerms::getNextOwnerPerms(std::string prefix) { - U32 flags = 0; + U32 flags = PERM_MOVE; if ( gSavedSettings.getBOOL(prefix+"NextOwnerCopy") ) { flags |= PERM_COPY; diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index f58f704ff2..278fee799a 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -35,6 +35,7 @@ #include "llagentcamera.h" #include "llcallbacklist.h" #include "llcriticaldamp.h" +#include "llfloaterperms.h" #include "llui.h" #include "llfocusmgr.h" #include "llbutton.h" @@ -999,8 +1000,8 @@ void LLSnapshotLivePreview::saveTexture() LLFolderType::FT_SNAPSHOT_CATEGORY, LLInventoryType::IT_SNAPSHOT, PERM_ALL, // Note: Snapshots to inventory is a special case of content upload - PERM_NONE, // that ignores the user's premissions preferences and continues to - PERM_NONE, // always use these fairly permissive hard-coded initial perms. - MG + LLFloaterPerms::getGroupPerms(), // that is more permissive than other uploads + LLFloaterPerms::getEveryonePerms(), "Snapshot : " + pos_string, callback, expected_upload_cost, userdata); gViewerWindow->playSnapshotAnimAndSound(); |