diff options
| author | callum <none@none> | 2011-05-06 13:40:13 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-05-06 13:40:13 -0700 |
| commit | d892256d5ba142bb8ea7ef11f64c67a498e725e9 (patch) | |
| tree | 47371b7ac7f48d95839c686eb41bb22b1d6d76a1 /indra/newview | |
| parent | 4ad94507dd17602323fa19027ff5bb5bfc6bc020 (diff) | |
| parent | 483ceba5f492430ddd4f3b5c8c9d0fdfe12f2a6f (diff) | |
Merge with head
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/app_settings/settings_minimal.xml | 2 | ||||
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_sound_devices.xml | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/app_settings/settings_minimal.xml b/indra/newview/app_settings/settings_minimal.xml index 9c6418b1f0..d3f0ec5dad 100644 --- a/indra/newview/app_settings/settings_minimal.xml +++ b/indra/newview/app_settings/settings_minimal.xml @@ -124,7 +124,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>0</integer> + <integer>1</integer> </map> <key>VoiceDisableMic</key> <map> diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index cad00eed14..c72cdfd1dc 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -555,8 +555,14 @@ BOOL LLBottomTray::postBuild() // Localization tool doesn't understand custom buttons like <talk_button> mSpeakBtn->setSpeakToolTip( getString("SpeakBtnToolTip") ); mSpeakBtn->setShowToolTip( getString("VoiceControlBtnToolTip") ); + } + else + { + LLTransientFloaterMgr::getInstance()->addControlView(getChild<LLButton>("speak_btn")); + LLTransientFloaterMgr::getInstance()->addControlView(getChild<LLButton>("speak_flyout_btn")); } + // Both parts of speak button should be initially disabled because // it takes some time between logging in to world and connecting to voice channel. getChild<LLButton>("speak_btn")->setEnabled(false); diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml index b5d95aeca4..c7c7a05af2 100644 --- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml +++ b/indra/newview/skins/default/xui/en/floater_sound_devices.xml @@ -4,7 +4,7 @@ border="false" legacy_header_height="18" can_minimize="true" - can_resize="true" + can_resize="false" can_close="false" save_dock_state="true" save_visibility="true" |