diff options
author | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:34 -0500 |
commit | cd17687f01420952712a500107e0f93e7ab8d5f8 (patch) | |
tree | ce48c2b706f2c1176290e39fb555fbdf6648ce01 /linden/indra/newview/llfloatervoicewizard.cpp | |
parent | Second Life viewer sources 1.19.0.5 (diff) | |
download | meta-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/llfloatervoicewizard.cpp')
-rw-r--r-- | linden/indra/newview/llfloatervoicewizard.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/linden/indra/newview/llfloatervoicewizard.cpp b/linden/indra/newview/llfloatervoicewizard.cpp index 65601ff..94063a0 100644 --- a/linden/indra/newview/llfloatervoicewizard.cpp +++ b/linden/indra/newview/llfloatervoicewizard.cpp | |||
@@ -83,7 +83,7 @@ void LLFloaterVoiceWizard::draw() | |||
83 | mDevicePanel->refresh(); | 83 | mDevicePanel->refresh(); |
84 | } | 84 | } |
85 | 85 | ||
86 | LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName(this, "wizard_tabs"); | 86 | LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName(this, "wizard_tabs"); |
87 | 87 | ||
88 | if (tabs) | 88 | if (tabs) |
89 | { | 89 | { |
@@ -156,7 +156,7 @@ void LLFloaterVoiceWizard::onClose(bool app_quitting) | |||
156 | // static | 156 | // static |
157 | void LLFloaterVoiceWizard::onClickNext(void *user_data) | 157 | void LLFloaterVoiceWizard::onClickNext(void *user_data) |
158 | { | 158 | { |
159 | LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs"); | 159 | LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs"); |
160 | if (tabs) | 160 | if (tabs) |
161 | { | 161 | { |
162 | tabs->selectNextTab(); | 162 | tabs->selectNextTab(); |
@@ -166,7 +166,7 @@ void LLFloaterVoiceWizard::onClickNext(void *user_data) | |||
166 | // static | 166 | // static |
167 | void LLFloaterVoiceWizard::onClickBack(void *user_data) | 167 | void LLFloaterVoiceWizard::onClickBack(void *user_data) |
168 | { | 168 | { |
169 | LLTabContainerCommon* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs"); | 169 | LLTabContainer* tabs = LLUICtrlFactory::getTabContainerByName((LLFloater*)user_data, "wizard_tabs"); |
170 | if (tabs) | 170 | if (tabs) |
171 | { | 171 | { |
172 | tabs->selectPrevTab(); | 172 | tabs->selectPrevTab(); |
@@ -364,7 +364,7 @@ void LLPanelDeviceSettings::refresh() | |||
364 | if(mCtrlInputDevices) | 364 | if(mCtrlInputDevices) |
365 | { | 365 | { |
366 | mCtrlInputDevices->removeall(); | 366 | mCtrlInputDevices->removeall(); |
367 | mCtrlInputDevices->add( childGetText("default_text"), ADD_BOTTOM ); | 367 | mCtrlInputDevices->add( getString("default_text"), ADD_BOTTOM ); |
368 | 368 | ||
369 | devices = gVoiceClient->getCaptureDevices(); | 369 | devices = gVoiceClient->getCaptureDevices(); |
370 | for(iter=devices->begin(); iter != devices->end(); iter++) | 370 | for(iter=devices->begin(); iter != devices->end(); iter++) |
@@ -374,14 +374,14 @@ void LLPanelDeviceSettings::refresh() | |||
374 | 374 | ||
375 | if(!mCtrlInputDevices->setSimple(mInputDevice)) | 375 | if(!mCtrlInputDevices->setSimple(mInputDevice)) |
376 | { | 376 | { |
377 | mCtrlInputDevices->setSimple(childGetText("default_text")); | 377 | mCtrlInputDevices->setSimple(getString("default_text")); |
378 | } | 378 | } |
379 | } | 379 | } |
380 | 380 | ||
381 | if(mCtrlOutputDevices) | 381 | if(mCtrlOutputDevices) |
382 | { | 382 | { |
383 | mCtrlOutputDevices->removeall(); | 383 | mCtrlOutputDevices->removeall(); |
384 | mCtrlOutputDevices->add( childGetText("default_text"), ADD_BOTTOM ); | 384 | mCtrlOutputDevices->add( getString("default_text"), ADD_BOTTOM ); |
385 | 385 | ||
386 | devices = gVoiceClient->getRenderDevices(); | 386 | devices = gVoiceClient->getRenderDevices(); |
387 | for(iter=devices->begin(); iter != devices->end(); iter++) | 387 | for(iter=devices->begin(); iter != devices->end(); iter++) |
@@ -391,7 +391,7 @@ void LLPanelDeviceSettings::refresh() | |||
391 | 391 | ||
392 | if(!mCtrlOutputDevices->setSimple(mOutputDevice)) | 392 | if(!mCtrlOutputDevices->setSimple(mOutputDevice)) |
393 | { | 393 | { |
394 | mCtrlOutputDevices->setSimple(childGetText("default_text")); | 394 | mCtrlOutputDevices->setSimple(getString("default_text")); |
395 | } | 395 | } |
396 | } | 396 | } |
397 | mDevicesUpdated = TRUE; | 397 | mDevicesUpdated = TRUE; |