Merge branch 'future' of git://github.com/siana/SingularityViewer.git

2011-06-30 10:27:13 -05:00
parent c3ccdeed1d 6348635d3f
commit 5cdcf0d237
65 changed files with 1714 additions and 1374 deletions
--- a/indra/newview/llfloateranimpreview.cpp
+++ b/indra/newview/llfloateranimpreview.cpp
@@ -1435,7 +1435,7 @@ void LLFloaterAnimPreview::onBtnOK(void* userdata)
 						    name,
 						    desc,
 						    0,
-						    LLAssetType::AT_NONE,
+						    LLFolderType::FT_ANIMATION,
 						    LLInventoryType::IT_ANIMATION,
 						    LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(),
 						    name,