summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateranimpreview.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-11-04 14:59:23 -0800
committerBryan O'Sullivan <bos@lindenlab.com>2009-11-04 14:59:23 -0800
commitb806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (patch)
tree26640bea40cb3913ab9d30ac99eeec936679a5ff /indra/newview/llfloateranimpreview.cpp
parent8b4818430fc120443b9dc677ae10fd072fffb6e6 (diff)
Redo Bao's broken merge
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,