diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 12:17:58 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-05 12:17:58 +0100 |
| commit | e2b51b8884d1003a3312276611b8a8c34123bc36 (patch) | |
| tree | 2a62d60e216e172685670230e544103444e28c4c /indra/newview/llfloaternamedesc.cpp | |
| parent | e2e329b2e22dbab52d12ff309fb78533cb52c8e9 (diff) | |
| parent | 7bb6532e93b7536a9a11cf19db10ba0cda1d99c3 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
| -rw-r--r-- | indra/newview/llfloaternamedesc.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp index 5c343ecb22..244b2f78c9 100644 --- a/indra/newview/llfloaternamedesc.cpp +++ b/indra/newview/llfloaternamedesc.cpp @@ -174,9 +174,10 @@ void LLFloaterNameDesc::onBtnOK( ) upload_new_resource(mFilenameAndPath, // file childGetValue("name_form").asString(), childGetValue("description_form").asString(), + 0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE, LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(), - display_name, NULL, expected_upload_cost); + display_name, NULL, expected_upload_cost, NULL); closeFloater(false); } |