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/llpreviewsound.cpp | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llpreviewsound.cpp')
| -rw-r--r-- | indra/newview/llpreviewsound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp index b92a6d58c8..3c23bf15ae 100644 --- a/indra/newview/llpreviewsound.cpp +++ b/indra/newview/llpreviewsound.cpp @@ -41,7 +41,7 @@ #include "llresmgr.h" #include "llviewercontrol.h" #include "llviewermessage.h" // send_guid_sound_trigger -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" extern LLAudioEngine* gAudiop; extern LLAgent gAgent; @@ -52,15 +52,15 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons LLPreview( name, rect, title, item_uuid, object_uuid) { - gUICtrlFactory->buildFloater(this,"floater_preview_sound.xml"); + LLUICtrlFactory::getInstance()->buildFloater(this,"floater_preview_sound.xml"); childSetAction("Sound play btn",&LLPreviewSound::playSound,this); childSetAction("Sound audition btn",&LLPreviewSound::auditionSound,this); - LLButton* button = LLUICtrlFactory::getButtonByName(this, "Sound play btn"); + LLButton* button = getChild<LLButton>("Sound play btn"); button->setSoundFlags(LLView::SILENT); - button = LLUICtrlFactory::getButtonByName(this, "Sound audition btn"); + button = getChild<LLButton>("Sound audition btn"); button->setSoundFlags(LLView::SILENT); const LLInventoryItem* item = getItem(); |