diff options
| author | Jonathan Yap <none@none> | 2012-06-09 10:05:54 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2012-06-09 10:05:54 -0400 |
| commit | d61a5f743c5d3bde0146b036508485bfdc9c3cb5 (patch) | |
| tree | 2aad8114d5c075470433d78da27e25f2989b64fe /indra/newview/llfloaternamedesc.cpp | |
| parent | dce0a9be48808d084f3c98615d5747544fe59ad5 (diff) | |
STORM-68 Removed debugging PERM_ALL that was causing upload trouble and removed 3 obsolete debug settings
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
| -rw-r--r-- | indra/newview/llfloaternamedesc.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp index eefc352287..97671a8614 100644 --- a/indra/newview/llfloaternamedesc.cpp +++ b/indra/newview/llfloaternamedesc.cpp @@ -45,6 +45,7 @@ #include "lluictrlfactory.h" #include "llstring.h" #include "lleconomy.h" +#include "llpermissions.h" // linden includes #include "llassetstorage.h" @@ -167,11 +168,16 @@ void LLFloaterNameDesc::onBtnOK( ) S32 expected_upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload(); // kinda hack - assumes that unsubclassed LLFloaterNameDesc is only used for uploading chargeable assets, which it is right now (it's only used unsubclassed for the sound upload dialog, and THAT should be a subclass). void *nruserdata = NULL; std::string display_name = LLStringUtil::null; + LLPermissions perm; + perm.setMaskNext(PERM_COPY); upload_new_resource(mFilenameAndPath, // file getChild<LLUICtrl>("name_form")->getValue().asString(), getChild<LLUICtrl>("description_form")->getValue().asString(), 0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE, - LLFloaterPerms::getNextOwnerPerms("Uploads"), LLFloaterPerms::getGroupPerms("Uploads"), LLFloaterPerms::getEveryonePerms("Uploads"), +perm.getMaskNextOwner(), +// LLFloaterPerms::getNextOwnerPerms("Uploads"), + LLFloaterPerms::getGroupPerms("Uploads"), + LLFloaterPerms::getEveryonePerms("Uploads"), display_name, callback, expected_upload_cost, nruserdata); closeFloater(false); } |