diff options
| author | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
|---|---|---|
| committer | Melinda Green <melinda@lindenlab.com> | 2008-12-15 21:21:19 +0000 |
| commit | e1d8dac25a93db837c780428a23f81cbf9109270 (patch) | |
| tree | a0bcaec0cec1ba6b3ce813764650eada61fcde4f /indra/newview/llfloateranimpreview.cpp | |
| parent | 9c0dbb123376608e464fcd8d1a2e288e01d78a3f (diff) | |
svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge
Resolving QAR-1051 Merge featurettes batch #4
Diffstat (limited to 'indra/newview/llfloateranimpreview.cpp')
| -rw-r--r-- | indra/newview/llfloateranimpreview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index 6c42a71fe6..c7e35bcfb5 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -52,6 +52,7 @@ #include "llfocusmgr.h" #include "llkeyframemotion.h" #include "lllineeditor.h" +#include "llfloaterperms.h" #include "llsliderctrl.h" #include "llspinctrl.h" #include "lltextbox.h" @@ -994,7 +995,7 @@ void LLFloaterAnimPreview::onBtnOK(void* userdata) 0, LLAssetType::AT_NONE, LLInventoryType::IT_ANIMATION, - PERM_NONE, + LLFloaterPerms::getNextOwnerPerms(), LLFloaterPerms::getGroupPerms(), LLFloaterPerms::getEveryonePerms(), name); } else |