diff -r dc5af272d23f doc/contributions.txt
--- a/doc/contributions.txt	Wed Jun 15 12:04:09 2011 -0400
+++ b/doc/contributions.txt	Sat Jun 18 07:00:29 2011 -0400
@@ -446,6 +446,7 @@
 	STORM-1313
 	STORM-899
 	STORM-1273
+	STORM-1392
 Kage Pixel
 	VWR-11
 Ken March
diff -r dc5af272d23f indra/newview/llbottomtray.cpp
--- a/indra/newview/llbottomtray.cpp	Wed Jun 15 12:04:09 2011 -0400
+++ b/indra/newview/llbottomtray.cpp	Sat Jun 18 07:00:29 2011 -0400
@@ -386,6 +386,7 @@
 	{
 		bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
 		getChild<LLButton>("speak_flyout_btn")->setEnabled(voice_status);
+		gMenuBarView->getChild<LLView>("Nearby Voice")->setEnabled(voice_status);
 		if (voice_status)
 		{
 			LLFirstUse::speak(true);
@@ -570,7 +571,7 @@
 	// it takes some time between logging in to world and connecting to voice channel.
 	getChild<LLButton>("speak_btn")->setEnabled(false);
 	getChild<LLButton>("speak_flyout_btn")->setEnabled(false);
-
+	gMenuBarView->getChild<LLView>("Nearby Voice")->setEnabled(false);
 
 	// Registering Chat Bar to receive Voice client status change notifications.
 	LLVoiceClient::getInstance()->addObserver(this);
diff -r dc5af272d23f indra/newview/skins/default/xui/en/menu_viewer.xml
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml	Wed Jun 15 12:04:09 2011 -0400
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml	Sat Jun 18 07:00:29 2011 -0400
@@ -232,6 +232,16 @@
              function="SideTray.PanelPeopleTab"
              parameter="nearby_panel" />
             </menu_item_call>
+        <menu_item_check
+         label="Nearby Voice"
+         name="Nearby Voice">
+            <menu_item_check.on_check
+             function="Floater.Visible"
+             parameter="voice_controls" />
+            <menu_item_check.on_click
+             function="Floater.Toggle"
+             parameter="voice_controls" />
+        </menu_item_check>
     </menu>
     <menu
      create_jump_keys="true"