diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-05 09:27:10 -0800 |
| commit | 270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch) | |
| tree | 5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/newview/llfloaternamedesc.cpp | |
| parent | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff) | |
| parent | 6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff) | |
merge from remote repo
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
| -rw-r--r-- | indra/newview/llfloaternamedesc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp index ed7d2c71ea..b7296518d4 100644 --- a/indra/newview/llfloaternamedesc.cpp +++ b/indra/newview/llfloaternamedesc.cpp @@ -176,7 +176,7 @@ void LLFloaterNameDesc::onBtnOK( ) upload_new_resource(mFilenameAndPath, // file childGetValue("name_form").asString(), childGetValue("description_form").asString(), - 0, LLAssetType::AT_NONE, LLInventoryType::IT_NONE, + 0, LLFolderType::FT_NONE, LLInventoryType::IT_NONE, LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(), display_name, callback, expected_upload_cost, nruserdata); closeFloater(false); |