diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
| commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
| tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/llpreviewanim.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llpreviewanim.cpp')
| -rw-r--r-- | indra/newview/llpreviewanim.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp index 105103d10b..868278472f 100644 --- a/indra/newview/llpreviewanim.cpp +++ b/indra/newview/llpreviewanim.cpp @@ -42,14 +42,14 @@ #include "llfilepicker.h" #include "lllineeditor.h" #include "lluictrlfactory.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" extern LLAgent gAgent; LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const S32& activate, const LLUUID& object_uuid ) : LLPreview( name, rect, title, item_uuid, object_uuid) { - gUICtrlFactory->buildFloater(this,"floater_preview_animation.xml"); + LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_animation.xml"); childSetAction("Anim play btn",playAnim,this); childSetAction("Anim audition btn",auditionAnim,this); @@ -116,7 +116,7 @@ void LLPreviewAnim::playAnim( void *userdata ) { LLUUID itemID=item->getAssetUUID(); - LLButton* btn = LLUICtrlFactory::getButtonByName(self, "Anim play btn"); + LLButton* btn = self->getChild<LLButton>("Anim play btn"); if (btn) { btn->toggleState(); @@ -153,7 +153,7 @@ void LLPreviewAnim::auditionAnim( void *userdata ) { LLUUID itemID=item->getAssetUUID(); - LLButton* btn = LLUICtrlFactory::getButtonByName(self, "Anim audition btn"); + LLButton* btn = self->getChild<LLButton>("Anim audition btn"); if (btn) { btn->toggleState(); |