aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpreviewgesture.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:34 -0500
committerJacek Antonelli2008-08-15 23:45:34 -0500
commitcd17687f01420952712a500107e0f93e7ab8d5f8 (patch)
treece48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llpreviewgesture.cpp
parentSecond Life viewer sources 1.19.0.5 (diff)
downloadmeta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.zip
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.gz
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.bz2
meta-impy-cd17687f01420952712a500107e0f93e7ab8d5f8.tar.xz
Second Life viewer sources 1.19.1.0
Diffstat (limited to 'linden/indra/newview/llpreviewgesture.cpp')
-rw-r--r--linden/indra/newview/llpreviewgesture.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index 1bd86fc..3594642 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -585,7 +585,7 @@ void LLPreviewGesture::addAnimations()
585 585
586 combo->removeall(); 586 combo->removeall();
587 587
588 LLString none_text = childGetText("none_text"); 588 LLString none_text = getString("none_text");
589 589
590 combo->add(none_text, LLUUID::null); 590 combo->add(none_text, LLUUID::null);
591 591
@@ -640,7 +640,7 @@ void LLPreviewGesture::addSounds()
640 LLComboBox* combo = mSoundCombo; 640 LLComboBox* combo = mSoundCombo;
641 combo->removeall(); 641 combo->removeall();
642 642
643 LLString none_text = childGetText("none_text"); 643 LLString none_text = getString("none_text");
644 644
645 combo->add(none_text, LLUUID::null); 645 combo->add(none_text, LLUUID::null);
646 646
@@ -789,7 +789,7 @@ void LLPreviewGesture::refresh()
789 case STEP_ANIMATION: 789 case STEP_ANIMATION:
790 { 790 {
791 LLGestureStepAnimation* anim_step = (LLGestureStepAnimation*)step; 791 LLGestureStepAnimation* anim_step = (LLGestureStepAnimation*)step;
792 optionstext = childGetText("step_anim"); 792 optionstext = getString("step_anim");
793 mAnimationCombo->setVisible(TRUE); 793 mAnimationCombo->setVisible(TRUE);
794 mAnimationRadio->setVisible(TRUE); 794 mAnimationRadio->setVisible(TRUE);
795 mAnimationRadio->setSelectedIndex((anim_step->mFlags & ANIM_FLAG_STOP) ? 1 : 0); 795 mAnimationRadio->setSelectedIndex((anim_step->mFlags & ANIM_FLAG_STOP) ? 1 : 0);
@@ -799,7 +799,7 @@ void LLPreviewGesture::refresh()
799 case STEP_SOUND: 799 case STEP_SOUND:
800 { 800 {
801 LLGestureStepSound* sound_step = (LLGestureStepSound*)step; 801 LLGestureStepSound* sound_step = (LLGestureStepSound*)step;
802 optionstext = childGetText("step_sound"); 802 optionstext = getString("step_sound");
803 mSoundCombo->setVisible(TRUE); 803 mSoundCombo->setVisible(TRUE);
804 mSoundCombo->setCurrentByID(sound_step->mSoundAssetID); 804 mSoundCombo->setCurrentByID(sound_step->mSoundAssetID);
805 break; 805 break;
@@ -807,7 +807,7 @@ void LLPreviewGesture::refresh()
807 case STEP_CHAT: 807 case STEP_CHAT:
808 { 808 {
809 LLGestureStepChat* chat_step = (LLGestureStepChat*)step; 809 LLGestureStepChat* chat_step = (LLGestureStepChat*)step;
810 optionstext = childGetText("step_chat"); 810 optionstext = getString("step_chat");
811 mChatEditor->setVisible(TRUE); 811 mChatEditor->setVisible(TRUE);
812 mChatEditor->setText(chat_step->mChatText); 812 mChatEditor->setText(chat_step->mChatText);
813 break; 813 break;
@@ -815,7 +815,7 @@ void LLPreviewGesture::refresh()
815 case STEP_WAIT: 815 case STEP_WAIT:
816 { 816 {
817 LLGestureStepWait* wait_step = (LLGestureStepWait*)step; 817 LLGestureStepWait* wait_step = (LLGestureStepWait*)step;
818 optionstext = childGetText("step_wait"); 818 optionstext = getString("step_wait");
819 mWaitAnimCheck->setVisible(TRUE); 819 mWaitAnimCheck->setVisible(TRUE);
820 mWaitAnimCheck->set(wait_step->mFlags & WAIT_FLAG_ALL_ANIM); 820 mWaitAnimCheck->set(wait_step->mFlags & WAIT_FLAG_ALL_ANIM);
821 mWaitTimeCheck->setVisible(TRUE); 821 mWaitTimeCheck->setVisible(TRUE);
@@ -1753,7 +1753,7 @@ void LLPreviewGesture::onClickPreview(void* data)
1753 self->mPreviewGesture->mCallbackData = self; 1753 self->mPreviewGesture->mCallbackData = self;
1754 1754
1755 // set the button title 1755 // set the button title
1756 self->mPreviewBtn->setLabel(self->childGetText("stop_txt")); 1756 self->mPreviewBtn->setLabel(self->getString("stop_txt"));
1757 1757
1758 // play it, and delete when done 1758 // play it, and delete when done
1759 gGestureManager.playGesture(self->mPreviewGesture); 1759 gGestureManager.playGesture(self->mPreviewGesture);
@@ -1775,7 +1775,7 @@ void LLPreviewGesture::onDonePreview(LLMultiGesture* gesture, void* data)
1775{ 1775{
1776 LLPreviewGesture* self = (LLPreviewGesture*)data; 1776 LLPreviewGesture* self = (LLPreviewGesture*)data;
1777 1777
1778 self->mPreviewBtn->setLabel(self->childGetText("preview_txt")); 1778 self->mPreviewBtn->setLabel(self->getString("preview_txt"));
1779 1779
1780 delete self->mPreviewGesture; 1780 delete self->mPreviewGesture;
1781 self->mPreviewGesture = NULL; 1781 self->mPreviewGesture = NULL;