diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:07:14 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-03 16:07:14 -0800 |
| commit | 16202f5e00c6e95f6df56ed8924c2fcb13b4ef17 (patch) | |
| tree | f9579b40277f21f07a325ae9d59dd230c203bef1 /indra/newview/llfloaternamedesc.cpp | |
| parent | 6ec038c0cad54f36d89678df63ae7526f5fb5bca (diff) | |
| parent | 2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (diff) | |
merge
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); |