summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateranimpreview.cpp
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-05 09:27:10 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-05 09:27:10 -0800
commit270629a3fe453e75c0ffeb780419ad3e27eeaa34 (patch)
tree5bb2f6f3e6871bc0285ed5b34a0166fd25074d68 /indra/newview/llfloateranimpreview.cpp
parenta0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (diff)
parent6f6d1314e6f1fe12391391172bffa52c9c08e380 (diff)
merge from remote repo
Diffstat (limited to 'indra/newview/llfloateranimpreview.cpp')
-rw-r--r--indra/newview/llfloateranimpreview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp
index 55b7ed0c99..095fe0a220 100644
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -989,7 +989,7 @@ void LLFloaterAnimPreview::onBtnOK(void* userdata)
name,
desc,
0,
- LLAssetType::AT_NONE,
+ LLFolderType::FT_NONE,
LLInventoryType::IT_ANIMATION,
LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(),
name,