diff options
| author | simon <none@none> | 2014-07-07 14:49:45 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-07-07 14:49:45 -0700 |
| commit | 3e6698073cedc8b24068147cf6b7091f081ea125 (patch) | |
| tree | 59d8759c554af8a733668dae9668ca6fd92bf820 /indra/newview/llviewermenufile.cpp | |
| parent | 770a0a2dea0bd503f88b35d3d440208bcd303e54 (diff) | |
| parent | 226929f8f5b8bc1080d0082b2595d689238df2b8 (diff) | |
Merge viewer-release and become version 3.7.12
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rwxr-xr-x | indra/newview/llviewermenufile.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 9199e7fd97..80f47ecab2 100755 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -443,9 +443,9 @@ class LLFileUploadBulk : public view_listener_t 0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE, - LLFloaterPerms::getNextOwnerPerms(), - LLFloaterPerms::getGroupPerms(), - LLFloaterPerms::getEveryonePerms(), + LLFloaterPerms::getNextOwnerPerms("Uploads"), + LLFloaterPerms::getGroupPerms("Uploads"), + LLFloaterPerms::getEveryonePerms("Uploads"), display_name, callback, expected_upload_cost, @@ -1007,9 +1007,9 @@ void upload_done_callback( 0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE, - PERM_NONE, - PERM_NONE, - PERM_NONE, + LLFloaterPerms::getNextOwnerPerms("Uploads"), + LLFloaterPerms::getGroupPerms("Uploads"), + LLFloaterPerms::getEveryonePerms("Uploads"), display_name, callback, expected_upload_cost, // assuming next in a group of uploads is of roughly the same type, i.e. same upload cost |