1 files changed, 2 insertions, 4 deletions

diff --git a/linden/indra/newview/llprefsvoice.cpp b/linden/indra/newview/llprefsvoice.cpp
index 22a0115..6661f08 100644
--- a/linden/indra/newview/llprefsvoice.cpp
+++ b/linden/indra/newview/llprefsvoice.cpp
@@ -57,7 +57,7 @@ private:
 
 public:
         LLVoiceHotkeySelectDialog( LLPrefsVoiceLogic *parent )
-                : LLModalDialog( "", 240, 100 ),
+                : LLModalDialog( LLStringUtil::null, 240, 100 ),
                   mParent( parent )
         {
                 mOldFrontmost = gFloaterView->getFrontmost();
@@ -96,7 +96,6 @@ void LLPrefsVoiceLogic::init()
         mEnableVoice = gSavedSettings.getBOOL("EnableVoiceChat");
 
         mVoiceCallsFriendsOnly = gSavedSettings.getBOOL("VoiceCallsFriendsOnly");
-//      mEnablePushToTalk = gSavedSettings.getBOOL("EnablePushToTalk");
         mModifier = gSavedSettings.getString("PushToTalkButton");
         mPushToTalkToggle = gSavedSettings.getBOOL("PushToTalkToggle");
         mEarLocation = gSavedSettings.getS32("VoiceEarLocation");
@@ -139,7 +138,6 @@ void LLPrefsVoiceLogic::cancel()
 {
         gSavedSettings.setBOOL("EnableVoiceChat", mEnableVoice);
         gSavedSettings.setBOOL("VoiceCallsFriendsOnly", mVoiceCallsFriendsOnly);
-//      gSavedSettings.setBOOL("EnablePushToTalk", mEnablePushToTalk );
         gSavedSettings.setString("PushToTalkButton", mModifier);
         gSavedSettings.setBOOL("PushToTalkToggle", mPushToTalkToggle );
         gSavedSettings.setS32("VoiceEarLocation", mEarLocation);
@@ -229,7 +227,7 @@ BOOL LLVoiceHotkeySelectDialog::handleKeyHere(KEY key, MASK mask)
 
 
 LLPrefsVoice::LLPrefsVoice()
-:       LLPanel("Voice Chat Panel")
+        :       LLPanel(std::string("Voice Chat Panel"))
 { 
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_voice.xml");
         mLogic = new LLPrefsVoiceLogic(this);