diff options
| author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
| commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
| tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llprefsvoice.cpp | |
| parent | Second Life viewer sources 1.20.15 (diff) | |
| download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz | |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llprefsvoice.cpp')
| -rw-r--r-- | linden/indra/newview/llprefsvoice.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp index 22a0115..5aa2cf4 100644 --- a/linden/indra/newview/llprefsvoice.cpp +++ b/linden/indra/newview/llprefsvoice.cpp | |||
| @@ -57,7 +57,7 @@ private: | |||
| 57 | 57 | ||
| 58 | public: | 58 | public: |
| 59 | LLVoiceHotkeySelectDialog( LLPrefsVoiceLogic *parent ) | 59 | LLVoiceHotkeySelectDialog( LLPrefsVoiceLogic *parent ) |
| 60 | : LLModalDialog( "", 240, 100 ), | 60 | : LLModalDialog( LLStringUtil::null, 240, 100 ), |
| 61 | mParent( parent ) | 61 | mParent( parent ) |
| 62 | { | 62 | { |
| 63 | mOldFrontmost = gFloaterView->getFrontmost(); | 63 | mOldFrontmost = gFloaterView->getFrontmost(); |
| @@ -229,7 +229,7 @@ BOOL LLVoiceHotkeySelectDialog::handleKeyHere(KEY key, MASK mask) | |||
| 229 | 229 | ||
| 230 | 230 | ||
| 231 | LLPrefsVoice::LLPrefsVoice() | 231 | LLPrefsVoice::LLPrefsVoice() |
| 232 | : LLPanel("Voice Chat Panel") | 232 | : LLPanel(std::string("Voice Chat Panel")) |
| 233 | { | 233 | { |
| 234 | LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_voice.xml"); | 234 | LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_voice.xml"); |
| 235 | mLogic = new LLPrefsVoiceLogic(this); | 235 | mLogic = new LLPrefsVoiceLogic(this); |