From 24c55c9a689aaf7c8c961a5eb4aab5283b0fb1fa Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 18 May 2010 14:16:25 +0100
Subject: EXT-7337 WIP Implemented prototype voice font preview floater.

---
 indra/newview/llfloatervoiceeffect.cpp | 172 +++++++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)
 create mode 100644 indra/newview/llfloatervoiceeffect.cpp

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
new file mode 100644
index 0000000000..5a579f5aeb
--- /dev/null
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -0,0 +1,172 @@
+/** 
+ * @file llfloatervoiceeffect.cpp
+ * @brief Selection and preview of voice effect.
+ *
+ * $LicenseInfo:firstyear=2010&license=viewergpl$
+ * 
+ * Copyright (c) 2002-2009, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llfloatervoiceeffect.h"
+
+#include "llscrolllistctrl.h"
+#include "lltrans.h"
+
+LLFloaterVoiceEffect::LLFloaterVoiceEffect(const LLSD& key)
+	: LLFloater(key)
+{
+	mCommitCallbackRegistrar.add("VoiceEffect.Record",	boost::bind(&LLFloaterVoiceEffect::onClickRecord, this));
+	mCommitCallbackRegistrar.add("VoiceEffect.Play",	boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
+}
+
+// virtual
+LLFloaterVoiceEffect::~LLFloaterVoiceEffect()
+{
+	if(LLVoiceClient::instanceExists())
+	{
+		LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+		if (effect_interface)
+		{
+			effect_interface->removeObserver(this);
+		}
+	}
+}
+
+// virtual
+BOOL LLFloaterVoiceEffect::postBuild()
+{
+	setDefaultBtn("record_btn");
+
+	mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list");
+
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (effect_interface)
+	{
+		effect_interface->addObserver(this);
+	}
+
+	update();
+
+	return TRUE;
+}
+
+// virtual
+void LLFloaterVoiceEffect::onClose(bool app_quitting)
+{
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (effect_interface)
+	{
+		effect_interface->clearPreviewBuffer();
+	}
+}
+
+void LLFloaterVoiceEffect::update()
+{
+	if (!mVoiceEffectList)
+	{
+		return;
+	}
+
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (!effect_interface) // || !LLVoiceClient::instance().isVoiceWorking())
+	{
+		mVoiceEffectList->setEnabled(false);
+		return;
+	}
+
+	mVoiceEffectList->deleteAllItems();
+	LLSD element;
+	element["id"] = LLUUID::null;
+	element["columns"][1]["column"] = "name";
+	element["columns"][1]["value"] = getString("no_voice_effect");
+	mVoiceEffectList->addElement(element, ADD_BOTTOM);
+
+	const voice_effect_list_t& effect_list = effect_interface->getVoiceEffectList();
+	if (!effect_list.empty())
+	{
+		for (voice_effect_list_t::const_iterator it = effect_list.begin(); it != effect_list.end(); ++it)
+		{
+			LLSD element;
+			element["id"] = it->second;
+			element["columns"][1]["column"] = "name";
+			element["columns"][1]["value"] = it->first;
+			mVoiceEffectList->addElement(element, ADD_BOTTOM);
+		}
+	}
+
+	mVoiceEffectList->setValue(effect_interface->getVoiceEffect());
+	mVoiceEffectList->setEnabled(true);
+
+	bool recording = effect_interface->isPreviewRecording();
+	getChild<LLButton>("record_btn")->setVisible(!recording);
+	getChild<LLButton>("record_stop_btn")->setVisible(recording);
+
+	getChild<LLButton>("play_btn")->setEnabled(effect_interface->isPreviewReady());
+	bool playing = effect_interface->isPreviewPlaying();
+	getChild<LLButton>("play_btn")->setVisible(!playing);
+	getChild<LLButton>("play_stop_btn")->setVisible(playing);
+}
+
+// virtual
+void LLFloaterVoiceEffect::onVoiceEffectChanged(bool new_effects)
+{
+	update();
+}
+
+void LLFloaterVoiceEffect::onClickRecord()
+{
+	LL_DEBUGS("Voice") << "Record clicked" << LL_ENDL;
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (effect_interface) // && LLVoiceClient::instance().isVoiceWorking())
+	{
+		bool record = !effect_interface->isPreviewRecording();
+		effect_interface->recordPreviewBuffer(record);
+		getChild<LLButton>("record_btn")->setVisible(!record);
+		getChild<LLButton>("record_stop_btn")->setVisible(record);
+	}
+}
+
+void LLFloaterVoiceEffect::onClickPlay()
+{
+	LL_DEBUGS("Voice") << "Play clicked" << LL_ENDL;
+	if (!mVoiceEffectList)
+	{
+		return;
+	}
+
+	const LLUUID& effect_id = mVoiceEffectList->getCurrentID();
+
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (effect_interface) // && LLVoiceClient::instance().isVoiceWorking())
+	{
+		bool play = !effect_interface->isPreviewPlaying();
+		effect_interface->playPreviewBuffer(play, effect_id);
+		getChild<LLButton>("play_btn")->setVisible(!play);
+		getChild<LLButton>("play_stop_btn")->setVisible(play);
+	}
+}
-- 
cgit v1.3


From 95ed59a9dec737ffe8d566595e1a74f662fe1e43 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 19 May 2010 16:28:03 +0100
Subject: EXT-7337 WIP Added template voice fonts to the voice font list for
 previewing

---
 indra/newview/llfloatervoiceeffect.cpp             | 91 ++++++++++++++++++----
 indra/newview/llvoiceclient.h                      |  1 +
 .../skins/default/xui/en/floater_voice_effect.xml  | 89 ++++++++++++++++-----
 3 files changed, 150 insertions(+), 31 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 5a579f5aeb..de12e8d12a 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -99,29 +99,94 @@ void LLFloaterVoiceEffect::update()
 		return;
 	}
 
+	LL_DEBUGS("Voice")<< "Rebuilding voice effect list."<< LL_ENDL;
+
+	// Preserve selected items and scroll position
+	S32 scroll_pos = mVoiceEffectList->getScrollPos();
+	uuid_vec_t selected_items;
+	std::vector<LLScrollListItem*> items = mVoiceEffectList->getAllSelected();
+	for(std::vector<LLScrollListItem*>::const_iterator it = items.begin(); it != items.end(); it++)
+	{
+		selected_items.push_back((*it)->getUUID());
+	}
+
 	mVoiceEffectList->deleteAllItems();
-	LLSD element;
-	element["id"] = LLUUID::null;
-	element["columns"][1]["column"] = "name";
-	element["columns"][1]["value"] = getString("no_voice_effect");
-	mVoiceEffectList->addElement(element, ADD_BOTTOM);
-
-	const voice_effect_list_t& effect_list = effect_interface->getVoiceEffectList();
-	if (!effect_list.empty())
+
 	{
-		for (voice_effect_list_t::const_iterator it = effect_list.begin(); it != effect_list.end(); ++it)
+		// Add the "No Voice Effect" entry
+		LLSD element;
+
+		element["id"] = LLUUID::null;
+		element["columns"][0]["column"] = "name";
+		element["columns"][0]["value"] = getString("no_voice_effect");
+		element["columns"][0]["font"]["name"] = "SANSSERIF";
+		element["columns"][0]["font"]["style"] = "BOLD";
+
+		LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM);
+		// *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :(
+		if(sl_item)
 		{
+			((LLScrollListText*)sl_item->getColumn(0))->setFontStyle(LLFontGL::BOLD);
+		}
+	}
+
+	const voice_effect_list_t& template_list = effect_interface->getVoiceEffectTemplateList();
+	if (!template_list.empty())
+	{
+		for (voice_effect_list_t::const_iterator it = template_list.begin(); it != template_list.end(); ++it)
+		{
+			const LLUUID& effect_id = it->second;
+			std::string effect_name = it->first;
+
+			LLSD effect_properties = effect_interface->getVoiceEffectProperties(effect_id);
+			bool is_template_only = effect_properties["template_only"].asBoolean();
+			bool is_new = effect_properties["is_new"].asBoolean();
+			std::string expiry_date = effect_properties["expiry_date"].asString();
+
+			std::string font_style = "NORMAL";
+			if (!is_template_only)
+			{
+				font_style = "BOLD";
+			}
 			LLSD element;
-			element["id"] = it->second;
-			element["columns"][1]["column"] = "name";
-			element["columns"][1]["value"] = it->first;
-			mVoiceEffectList->addElement(element, ADD_BOTTOM);
+			element["id"] = effect_id;
+
+			element["columns"][0]["column"] = "name";
+			element["columns"][0]["value"] = effect_name;
+			element["columns"][0]["font"]["name"] = "SANSSERIF";
+			element["columns"][0]["font"]["style"] = font_style;
+			element["columns"][1]["column"] = "new";
+			element["columns"][1]["value"] = is_new ? getString("new_voice_effect") : "";
+			element["columns"][1]["font"]["name"] = "SANSSERIF";
+			element["columns"][1]["font"]["style"] = font_style;
+
+			element["columns"][2]["column"] = "expires";
+			element["columns"][2]["value"] = !is_template_only ? expiry_date : "";
+			element["columns"][2]["font"]["name"] = "SANSSERIF";
+			element["columns"][2]["font"]["style"] = font_style;
+
+			LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM);
+			// *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :(
+			if(sl_item)
+			{
+				LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD;
+				((LLScrollListText*)sl_item->getColumn(0))->setFontStyle(style);
+			}
 		}
 	}
 
+	// Re-select items that were selected before, and restore the scroll position
+	for(uuid_vec_t::iterator it = selected_items.begin(); it != selected_items.end(); it++)
+	{
+		mVoiceEffectList->selectByID(*it);
+	}
+	mVoiceEffectList->setScrollPos(scroll_pos);
+
 	mVoiceEffectList->setValue(effect_interface->getVoiceEffect());
 	mVoiceEffectList->setEnabled(true);
 
+	// Update button states
+	// *TODO: Should separate this from rebuilding the effects list, to avoid rebuilding it unnecessarily
 	bool recording = effect_interface->isPreviewRecording();
 	getChild<LLButton>("record_btn")->setVisible(!recording);
 	getChild<LLButton>("record_stop_btn")->setVisible(recording);
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 8d898378d6..5caf26c492 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -289,6 +289,7 @@ public:
 	//@{
 	virtual bool setVoiceEffect(const LLUUID& id) = 0;
 	virtual const LLUUID getVoiceEffect() = 0;
+	virtual LLSD getVoiceEffectProperties(const LLUUID& id) = 0;
 
 	virtual void refreshVoiceEffectLists(bool clear_lists) = 0;
 	virtual const voice_effect_list_t &getVoiceEffectList() const = 0;
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 5627eb3aff..8f2f13dffe 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -16,6 +16,9 @@
   <string name="no_voice_effect">
     No Voice Effect
   </string>
+  <string name="new_voice_effect">
+    New!
+  </string>
   <scroll_list
    bottom_delta="400"
    draw_heading="true"
@@ -25,24 +28,76 @@
    multi_select="false"
    top="20"
    name="voice_effect_list">
-    <scroll_list.columns
-     label="New"
-     name="new"
-     width="48" />
     <scroll_list.columns
      label="Name"
      name="name"
      width="153" />
+    <scroll_list.columns
+     label="New"
+     name="new"
+     width="48" />
 	<scroll_list.columns
      label="Expires"
      name="expires"
      width="100" />
-    <scroll_list.columns
-     label=""
-     name="key"
-     width="-1" />
   </scroll_list>
-  <panel
+              <panel
+             background_visible="true"
+             bevel_style="none"
+             top_pad="0"
+             follows="left|right|bottom"
+             height="30"
+             label="bottom_panel"
+             layout="topleft"
+             left="0"
+             name="bottom_panel"
+             width="313">
+<!--
+              <menu_button
+               follows="bottom|left"
+               height="18"
+               image_disabled="OptionsMenu_Disabled"
+               image_selected="OptionsMenu_Press"
+               image_unselected="OptionsMenu_Off"
+               layout="topleft"
+               left="10"
+               menu_filename="menu_voice_effect_gear.xml"
+               name="gear_btn"
+               top="5"
+               tool_tip="More options"
+               width="18" />
+-->
+    <button
+     follows="bottom|left"
+     font="SansSerifBigBold"
+     height="18"
+     image_selected="AddItem_Press"
+     image_unselected="AddItem_Off"
+     image_disabled="AddItem_Disabled"
+     layout="topleft"
+     left="10"
+     name="new_gesture_btn"
+     tool_tip="Make new gesture"
+     top="5"
+     width="18" />
+    <button
+     follows="bottom|left"
+     font="SansSerifBigBold"
+     height="10"
+     image_hover_selected="Activate_Checkmark"
+     image_selected="Activate_Checkmark"
+     image_unselected="Activate_Checkmark"
+     layout="topleft"
+     left_pad="5"
+     name="activate_btn"
+     tool_tip="Activate/Deactivate selected voice effect"
+     top="10"
+     width="10">
+      <button.commit_callback
+       function="VoiceEffect.Activate" />
+    </button>
+  </panel>
+<!--  <panel
    background_visible="true"
    bevel_style="none"
    top_pad="0"
@@ -53,7 +108,6 @@
    left="0"
    name="bottom_panel"
    width="313">
-<!--
     <button
      follows="bottom|left"
      font="SansSerifBigBold"
@@ -70,17 +124,16 @@
       <button.commit_callback
        function="VoiceEffect.Activate" />
     </button>
--->
-  </panel>
+  </panel> -->
   <button
    follows="left|bottom"
    height="23"
-   label="Record"
+   label="Record Sample"
    layout="topleft"
    left="6"
    name="record_btn"
    top_pad="5"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -92,19 +145,19 @@
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
   <button
    follows="left|bottom"
    height="23"
-   label="Play"
+   label="Play Preview"
    layout="topleft"
    left_pad="6"
    name="play_btn"
    top_delta="0"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Play" />
   </button>
@@ -116,7 +169,7 @@
    left_delta="0"
    name="play_stop_btn"
    top_delta="0"
-   width="83">
+   width="135">
     <button.commit_callback
      function="VoiceEffect.Play" />
   </button>
-- 
cgit v1.3


From 4f2f2f90378e5191cd00748c2cc6633af3efd230 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Wed, 19 May 2010 21:14:24 +0100
Subject: EXT-7138 WIP Enable activation of voice effects from the Voice
 Effects floater

---
 indra/newview/llfloatervoiceeffect.cpp             | 28 +++++++++++++++++++---
 indra/newview/llfloatervoiceeffect.h               |  3 ++-
 .../skins/default/xui/en/floater_voice_effect.xml  | 12 +++++++---
 3 files changed, 36 insertions(+), 7 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index de12e8d12a..60831936ca 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -36,12 +36,15 @@
 
 #include "llscrolllistctrl.h"
 #include "lltrans.h"
+#include "llweb.h"
 
 LLFloaterVoiceEffect::LLFloaterVoiceEffect(const LLSD& key)
 	: LLFloater(key)
 {
 	mCommitCallbackRegistrar.add("VoiceEffect.Record",	boost::bind(&LLFloaterVoiceEffect::onClickRecord, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Play",	boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
+	mCommitCallbackRegistrar.add("VoiceEffect.Add",		boost::bind(&LLFloaterVoiceEffect::onClickAdd, this));
+	mCommitCallbackRegistrar.add("VoiceEffect.Activate", boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
 }
 
 // virtual
@@ -63,6 +66,10 @@ BOOL LLFloaterVoiceEffect::postBuild()
 	setDefaultBtn("record_btn");
 
 	mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list");
+	if (mVoiceEffectList)
+	{
+		mVoiceEffectList->setDoubleClickCallback(boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
+	}
 
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 	if (effect_interface)
@@ -93,7 +100,7 @@ void LLFloaterVoiceEffect::update()
 	}
 
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-	if (!effect_interface) // || !LLVoiceClient::instance().isVoiceWorking())
+	if (!effect_interface)
 	{
 		mVoiceEffectList->setEnabled(false);
 		return;
@@ -207,7 +214,7 @@ void LLFloaterVoiceEffect::onClickRecord()
 {
 	LL_DEBUGS("Voice") << "Record clicked" << LL_ENDL;
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-	if (effect_interface) // && LLVoiceClient::instance().isVoiceWorking())
+	if (effect_interface)
 	{
 		bool record = !effect_interface->isPreviewRecording();
 		effect_interface->recordPreviewBuffer(record);
@@ -227,7 +234,7 @@ void LLFloaterVoiceEffect::onClickPlay()
 	const LLUUID& effect_id = mVoiceEffectList->getCurrentID();
 
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-	if (effect_interface) // && LLVoiceClient::instance().isVoiceWorking())
+	if (effect_interface)
 	{
 		bool play = !effect_interface->isPreviewPlaying();
 		effect_interface->playPreviewBuffer(play, effect_id);
@@ -235,3 +242,18 @@ void LLFloaterVoiceEffect::onClickPlay()
 		getChild<LLButton>("play_stop_btn")->setVisible(play);
 	}
 }
+
+void LLFloaterVoiceEffect::onClickAdd()
+{
+	// Open the voice morphing info web page
+	LLWeb::loadURL(getString("get_voice_effects_url"));
+}
+
+void LLFloaterVoiceEffect::onClickActivate()
+{
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (effect_interface && mVoiceEffectList)
+	{
+		effect_interface->setVoiceEffect(mVoiceEffectList->getCurrentID());
+	}
+}
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index cd639dba5a..5ad64f0e26 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -60,7 +60,8 @@ private:
 
 	void onClickRecord();
 	void onClickPlay();
-// 	void onClickActivate();
+ 	void onClickAdd();
+ 	void onClickActivate();
 
 	LLUUID mSelectedID;
 	LLScrollListCtrl* mVoiceEffectList;
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 8452fb55b7..1f28a6375f 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -16,6 +16,9 @@
   <string name="no_voice_effect">
     No Voice Effect
   </string>
+  <string name="get_voice_effects_url">
+    https://secondlife.com/my/account/voice.php
+  </string>
   <string name="new_voice_effect">
     New!
   </string>
@@ -76,10 +79,13 @@
      image_disabled="AddItem_Disabled"
      layout="topleft"
      left="10"
-     name="new_gesture_btn"
-     tool_tip="Make new gesture"
+     name="add_voice_effect_btn"
+     tool_tip="Get more voice effects"
      top="5"
-     width="18" />
+     width="18">
+      <button.commit_callback
+       function="VoiceEffect.Add" />
+    </button>
     <button
      follows="bottom|left"
      font="SansSerifBigBold"
-- 
cgit v1.3


From 5cf632aacbae683676c341a7f1470108cdf65b59 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sat, 22 May 2010 17:58:45 +0100
Subject: EXT-7138 WIP Voice Morphing - Go into stateCaptureBufferPaused as
 soon as the Voice Effects preview is opened. Disconnecting from voice on
 hitting record was taking too long and causing the start of the voice
 recording to be cut off.

---
 indra/newview/llfloatervoiceeffect.cpp |  5 +-
 indra/newview/llvoiceclient.h          |  6 +--
 indra/newview/llvoicevivox.cpp         | 86 +++++++++++++++-------------------
 indra/newview/llvoicevivox.h           | 13 ++---
 4 files changed, 53 insertions(+), 57 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 60831936ca..f38a56a06d 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -75,6 +75,9 @@ BOOL LLFloaterVoiceEffect::postBuild()
 	if (effect_interface)
 	{
 		effect_interface->addObserver(this);
+
+		// Disconnect from the current voice channel ready to record a voice sample for previewing
+		effect_interface->enablePreviewBuffer(true);
 	}
 
 	update();
@@ -88,7 +91,7 @@ void LLFloaterVoiceEffect::onClose(bool app_quitting)
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 	if (effect_interface)
 	{
-		effect_interface->clearPreviewBuffer();
+		effect_interface->enablePreviewBuffer(false);
 	}
 }
 
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 5caf26c492..2fa309d959 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -306,9 +306,9 @@ public:
 	//////////////////////////////
 	/// @name Preview buffer
 	//@{
-	virtual void recordPreviewBuffer(bool enable) = 0;
-	virtual void playPreviewBuffer(bool enable, const LLUUID& effect_id = LLUUID::null) = 0;
-	virtual void clearPreviewBuffer() = 0;
+	virtual void enablePreviewBuffer(bool enable) = 0;
+	virtual void recordPreviewBuffer(bool record) = 0;
+	virtual void playPreviewBuffer(bool play, const LLUUID& effect_id = LLUUID::null) = 0;
 
 	virtual bool isPreviewRecording() = 0;
 	virtual bool isPreviewReady() = 0;
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 7daf865151..a64c05a3c6 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -342,7 +342,9 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
 	mVoiceFontsReceived(false),
 	mVoiceFontsNew(false),
 
+	mCaptureBufferMode(false),
 	mCaptureBufferRecording(false),
+	mCaptureBufferRecorded(false),
 	mCaptureBufferPlaying(false)
 {	
 	mSpeakerVolume = scale_speaker_volume(0);
@@ -1130,7 +1132,12 @@ void LLVivoxVoiceClient::stateMachine()
 
 		//MARK: stateCaptureBufferPaused
 		case stateCaptureBufferPaused:
-			if (mCaptureBufferRecording)
+			if (!mCaptureBufferMode)
+			{
+				mCaptureBufferRecorded = false;
+				setState(stateNoChannel);
+			}
+			else if (mCaptureBufferRecording)
 			{
 				setState(stateCaptureBufferRecStart);
 				// Update UI, should really be separated from the VoiceFont callback
@@ -1141,22 +1148,18 @@ void LLVivoxVoiceClient::stateMachine()
 				setState(stateCaptureBufferPlayStart);
 				notifyVoiceFontObservers();
 			}
-			else if (mCaptureBufferClear)
-			{
-				mCaptureBufferClear = false;
-				setState(stateNoChannel);
-			}
 		break;
 
 		//MARK: stateCaptureBufferRecStart
 		case stateCaptureBufferRecStart:
 			captureBufferRecordStartSendMessage();
+			mCaptureBufferRecorded = true;
 			setState(stateCaptureBufferRecording);
 		break;
 
 		//MARK: stateCaptureBufferRecording
 		case stateCaptureBufferRecording:
-			if (!mCaptureBufferRecording || mCaptureBufferPlaying || mCaptureBufferClear)
+			if (!mCaptureBufferMode || !mCaptureBufferRecording || mCaptureBufferPlaying)
 			{
 				mCaptureBufferRecording = false;
 				captureBufferRecordStopSendMessage();
@@ -1173,7 +1176,7 @@ void LLVivoxVoiceClient::stateMachine()
 
 		//MARK: stateCaptureBufferPlaying
 		case stateCaptureBufferPlaying:
-			if (!mCaptureBufferPlaying || mCaptureBufferRecording || mCaptureBufferClear)
+			if (!mCaptureBufferMode || !mCaptureBufferPlaying || mCaptureBufferRecording)
 			{
 				mCaptureBufferPlaying = false;
 				captureBufferPlayStopSendMessage();
@@ -1382,10 +1385,9 @@ void LLVivoxVoiceClient::stateMachine()
 				mTuningExitState = stateNoChannel;
 				setState(stateMicTuningStart);
 			}
-			else if(mCaptureBufferRecording)
+			else if(mCaptureBufferMode)
 			{
-				mTuningExitState = stateNoChannel;
-				setState(stateCaptureBufferRecStart);
+				setState(stateCaptureBufferPaused);
 			}
 			else if(sessionNeedsRelog(mNextAudioSession))
 			{
@@ -6693,42 +6695,43 @@ void LLVivoxVoiceClient::notifyVoiceFontObservers(bool new_fonts)
 	}
 }
 
-void LLVivoxVoiceClient::recordPreviewBuffer(bool enable)
+void LLVivoxVoiceClient::enablePreviewBuffer(bool enable)
 {
-	if (enable)
-	{
-		mCaptureBufferRecording = true;
-		LL_DEBUGS("Voice") << "Starting recording" << LL_ENDL;
-		if(getState() >= stateNoChannel)
-		{
-			LL_DEBUGS("Voice") << "no channel" << LL_ENDL;
-			sessionTerminate();
-		}
-	}
-	else
+	mCaptureBufferMode = enable;
+	if(mCaptureBufferMode && getState() >= stateNoChannel)
 	{
-		mCaptureBufferRecording = false;
+		LL_DEBUGS("Voice") << "no channel" << LL_ENDL;
+		sessionTerminate();
 	}
 }
 
-void LLVivoxVoiceClient::playPreviewBuffer(bool enable, const LLUUID& effect_id)
+void LLVivoxVoiceClient::recordPreviewBuffer(bool record)
 {
-	if (enable && !isPreviewReady())
+	if (record && !mCaptureBufferMode)
 	{
-		LL_DEBUGS("Voice") << "No preview buffer to play" << LL_ENDL;
+		LL_DEBUGS("Voice") << "Cannot start recording, not in preview mode." << LL_ENDL;
 		return;
 	}
 
-	mCaptureBufferPlaying = enable;
-	if (mCaptureBufferPlaying)
-	{
-		mPreviewVoiceFontID = effect_id;
-	}
+	mCaptureBufferRecording = record;
 }
 
-void LLVivoxVoiceClient::clearPreviewBuffer()
+void LLVivoxVoiceClient::playPreviewBuffer(bool play, const LLUUID& effect_id)
 {
-	mCaptureBufferClear = true;
+	if (play)
+	{
+		if (mCaptureBufferMode && mCaptureBufferRecorded)
+		{
+			mPreviewVoiceFontID = effect_id;
+		}
+		else
+		{
+			LL_DEBUGS("Voice") << "No preview buffer to play." << LL_ENDL;
+			return;
+		}
+	}
+
+	mCaptureBufferPlaying = play;
 }
 
 bool LLVivoxVoiceClient::isPreviewRecording()
@@ -6738,18 +6741,8 @@ bool LLVivoxVoiceClient::isPreviewRecording()
 
 bool LLVivoxVoiceClient::isPreviewReady()
 {
-	state preview_state = getState();
-	switch (preview_state)
-	{
-		case stateCaptureBufferPaused:
-		case stateCaptureBufferRecording:
-		case stateCaptureBufferPlaying:
-			return true;
-			break;
-		default:
-			return false;
-			break;
-	}
+	return mCaptureBufferRecorded;
+
 }
 
 bool LLVivoxVoiceClient::isPreviewPlaying()
@@ -6767,7 +6760,6 @@ void LLVivoxVoiceClient::captureBufferRecordStartSendMessage()
 		// Start capture
 		stream
 		<< "<Request requestId=\"" << mCommandCookie++ << "\" action=\"Aux.StartBufferCapture.1\">"
-			<< "<AccountHandle>" << mAccountHandle << "</AccountHandle>"
 		<< "</Request>"
 		<< "\n\n\n";
 
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 5ba8082d56..e4250d2ba3 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -257,9 +257,9 @@ public:
 	//////////////////////////////
 	/// @name Effect preview buffer
 	//@{
-	virtual void recordPreviewBuffer(bool enable);
-	virtual void playPreviewBuffer(bool enable, const LLUUID& effect_id = LLUUID::null);
-	virtual void clearPreviewBuffer();
+	virtual void enablePreviewBuffer(bool enable);
+	virtual void recordPreviewBuffer(bool record);
+	virtual void playPreviewBuffer(bool play, const LLUUID& effect_id = LLUUID::null);
 
 	virtual bool isPreviewRecording();
 	virtual bool isPreviewReady();
@@ -919,9 +919,10 @@ private:
 	void captureBufferPlayStartSendMessage(const LLUUID& voice_font_id = LLUUID::null);
 	void captureBufferPlayStopSendMessage();
 
-	bool mCaptureBufferRecording;
-	bool mCaptureBufferPlaying;
-	bool mCaptureBufferClear;
+	bool mCaptureBufferMode;		// Disconnected from voice channels while using the capture buffer.
+	bool mCaptureBufferRecording;	// A voice sample is being captured.
+	bool mCaptureBufferRecorded;	// A voice sample is captured in the buffer ready to play.
+	bool mCaptureBufferPlaying;		// A voice sample is being played.
 
 	LLUUID mPreviewVoiceFontID;
 };
-- 
cgit v1.3


From 1ebbe196910110eb51497f272abde277f8f0f69a Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 02:22:48 +0100
Subject: EXT-7337 WIP Voice morph previewing Separate Play and Stop callbacks,
 to allow single click previews in the effect list.

---
 indra/newview/llfloatervoiceeffect.cpp             |  61 ++++++++---
 indra/newview/llfloatervoiceeffect.h               |   4 +-
 indra/newview/llvoiceclient.h                      |   5 +-
 indra/newview/llvoicevivox.cpp                     | 118 +++++++++++++++------
 indra/newview/llvoicevivox.h                       |   9 +-
 .../skins/default/xui/en/floater_voice_effect.xml  |   4 +-
 6 files changed, 142 insertions(+), 59 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index f38a56a06d..0fa6135da2 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -43,6 +43,7 @@ LLFloaterVoiceEffect::LLFloaterVoiceEffect(const LLSD& key)
 {
 	mCommitCallbackRegistrar.add("VoiceEffect.Record",	boost::bind(&LLFloaterVoiceEffect::onClickRecord, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Play",	boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
+	mCommitCallbackRegistrar.add("VoiceEffect.Stop",	boost::bind(&LLFloaterVoiceEffect::onClickStop, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Add",		boost::bind(&LLFloaterVoiceEffect::onClickAdd, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Activate", boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
 }
@@ -68,6 +69,7 @@ BOOL LLFloaterVoiceEffect::postBuild()
 	mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list");
 	if (mVoiceEffectList)
 	{
+		mVoiceEffectList->setCommitCallback(boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
 		mVoiceEffectList->setDoubleClickCallback(boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
 	}
 
@@ -80,7 +82,8 @@ BOOL LLFloaterVoiceEffect::postBuild()
 		effect_interface->enablePreviewBuffer(true);
 	}
 
-	update();
+	refreshEffectList();
+	updateControls();
 
 	return TRUE;
 }
@@ -95,7 +98,7 @@ void LLFloaterVoiceEffect::onClose(bool app_quitting)
 	}
 }
 
-void LLFloaterVoiceEffect::update()
+void LLFloaterVoiceEffect::refreshEffectList()
 {
 	if (!mVoiceEffectList)
 	{
@@ -194,23 +197,42 @@ void LLFloaterVoiceEffect::update()
 
 	mVoiceEffectList->setValue(effect_interface->getVoiceEffect());
 	mVoiceEffectList->setEnabled(true);
+}
+
+void LLFloaterVoiceEffect::updateControls()
+{
+	bool recording = false;
+	bool playing = false;
+
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (effect_interface)
+	{
+		recording = effect_interface->isPreviewRecording();
+		playing = effect_interface->isPreviewPlaying();
+	}
 
-	// Update button states
-	// *TODO: Should separate this from rebuilding the effects list, to avoid rebuilding it unnecessarily
-	bool recording = effect_interface->isPreviewRecording();
 	getChild<LLButton>("record_btn")->setVisible(!recording);
 	getChild<LLButton>("record_stop_btn")->setVisible(recording);
 
-	getChild<LLButton>("play_btn")->setEnabled(effect_interface->isPreviewReady());
-	bool playing = effect_interface->isPreviewPlaying();
 	getChild<LLButton>("play_btn")->setVisible(!playing);
 	getChild<LLButton>("play_stop_btn")->setVisible(playing);
+
+	getChild<LLButton>("play_btn")->setEnabled(effect_interface->isPreviewReady());
+
+	if (!mVoiceEffectList)
+	{
+		mVoiceEffectList->setValue(effect_interface->getVoiceEffect());
+	}
 }
 
 // virtual
 void LLFloaterVoiceEffect::onVoiceEffectChanged(bool new_effects)
 {
-	update();
+	if (new_effects)
+	{
+		refreshEffectList();
+	}
+	updateControls();
 }
 
 void LLFloaterVoiceEffect::onClickRecord()
@@ -219,11 +241,9 @@ void LLFloaterVoiceEffect::onClickRecord()
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 	if (effect_interface)
 	{
-		bool record = !effect_interface->isPreviewRecording();
-		effect_interface->recordPreviewBuffer(record);
-		getChild<LLButton>("record_btn")->setVisible(!record);
-		getChild<LLButton>("record_stop_btn")->setVisible(record);
+		effect_interface->recordPreviewBuffer();
 	}
+	updateControls();
 }
 
 void LLFloaterVoiceEffect::onClickPlay()
@@ -239,11 +259,20 @@ void LLFloaterVoiceEffect::onClickPlay()
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 	if (effect_interface)
 	{
-		bool play = !effect_interface->isPreviewPlaying();
-		effect_interface->playPreviewBuffer(play, effect_id);
-		getChild<LLButton>("play_btn")->setVisible(!play);
-		getChild<LLButton>("play_stop_btn")->setVisible(play);
+		effect_interface->playPreviewBuffer(effect_id);
+	}
+	updateControls();
+}
+
+void LLFloaterVoiceEffect::onClickStop()
+{
+	LL_DEBUGS("Voice") << "Stop clicked" << LL_ENDL;
+	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+	if (effect_interface)
+	{
+		effect_interface->stopPreviewBuffer();
 	}
+	updateControls();
 }
 
 void LLFloaterVoiceEffect::onClickAdd()
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index 5ad64f0e26..060ffc99e9 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -53,13 +53,15 @@ public:
 	virtual void onClose(bool app_quitting);
 
 private:
-	void update();
+	void refreshEffectList();
+	void updateControls();
 
 	/// Called by voice effect provider when voice effect list is changed.
 	virtual void onVoiceEffectChanged(bool new_effects);
 
 	void onClickRecord();
 	void onClickPlay();
+	void onClickStop();
  	void onClickAdd();
  	void onClickActivate();
 
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 2fa309d959..02c0ece427 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -307,8 +307,9 @@ public:
 	/// @name Preview buffer
 	//@{
 	virtual void enablePreviewBuffer(bool enable) = 0;
-	virtual void recordPreviewBuffer(bool record) = 0;
-	virtual void playPreviewBuffer(bool play, const LLUUID& effect_id = LLUUID::null) = 0;
+	virtual void recordPreviewBuffer() = 0;
+	virtual void playPreviewBuffer(const LLUUID& effect_id = LLUUID::null) = 0;
+	virtual void stopPreviewBuffer() = 0;
 
 	virtual bool isPreviewRecording() = 0;
 	virtual bool isPreviewReady() = 0;
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index f1c8ce21d2..ba68795870 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -348,7 +348,8 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
 	mCaptureBufferMode(false),
 	mCaptureBufferRecording(false),
 	mCaptureBufferRecorded(false),
-	mCaptureBufferPlaying(false)
+	mCaptureBufferPlaying(false),
+	mPlayRequestCount(0)
 {	
 	mSpeakerVolume = scale_speaker_volume(0);
 
@@ -1137,28 +1138,39 @@ void LLVivoxVoiceClient::stateMachine()
 		case stateCaptureBufferPaused:
 			if (!mCaptureBufferMode)
 			{
+				// Leaving capture mode.
+
+				mCaptureBufferRecording = false;
 				mCaptureBufferRecorded = false;
+				mCaptureBufferPlaying = false;
+
+				// Return to stateNoChannel to trigger reconnection to a channel.
 				setState(stateNoChannel);
 			}
 			else if (mCaptureBufferRecording)
 			{
 				setState(stateCaptureBufferRecStart);
-				// Update UI, should really be separated from the VoiceFont callback
-				notifyVoiceFontObservers();
 			}
 			else if (mCaptureBufferPlaying)
 			{
 				setState(stateCaptureBufferPlayStart);
-				notifyVoiceFontObservers();
 			}
 		break;
 
 		//MARK: stateCaptureBufferRecStart
 		case stateCaptureBufferRecStart:
 			captureBufferRecordStartSendMessage();
+
+			// Flag that something is recorded to allow playback.
 			mCaptureBufferRecorded = true;
+
+			// Start the timer, recording will be stopped when it expires.
 			mCaptureTimer.start();
 			mCaptureTimer.setTimerExpirySec(CAPTURE_BUFFER_MAX_TIME);
+
+			// Update UI, should really use a separate callback.
+			notifyVoiceFontObservers(false);
+
 			setState(stateCaptureBufferRecording);
 		break;
 
@@ -1167,27 +1179,47 @@ void LLVivoxVoiceClient::stateMachine()
 			if (!mCaptureBufferMode || !mCaptureBufferRecording ||
 				mCaptureBufferPlaying || mCaptureTimer.hasExpired())
 			{
-				mCaptureBufferRecording = false;
+				// Stop recording
 				captureBufferRecordStopSendMessage();
+				mCaptureBufferRecording = false;
+
+				// Update UI, should really use a separate callback.
+				notifyVoiceFontObservers(false);
+
 				setState(stateCaptureBufferPaused);
-				notifyVoiceFontObservers();
 			}
 		break;
 
 		//MARK: stateCaptureBufferPlayStart
 		case stateCaptureBufferPlayStart:
-			captureBufferPlayStartSendMessage(mPreviewVoiceFontID);
+			captureBufferPlayStartSendMessage(mPreviewVoiceFont);
+
+			// Store the voice font being previewed, so that we know to restart if it changes.
+			mPreviewVoiceFontLast = mPreviewVoiceFont;
+
+			// Update UI, should really use a separate callback.
+			notifyVoiceFontObservers(false);
+
 			setState(stateCaptureBufferPlaying);
 		break;
 
 		//MARK: stateCaptureBufferPlaying
 		case stateCaptureBufferPlaying:
-			if (!mCaptureBufferMode || !mCaptureBufferPlaying || mCaptureBufferRecording)
+			if (mCaptureBufferPlaying && mPreviewVoiceFont != mPreviewVoiceFontLast)
 			{
-				mCaptureBufferPlaying = false;
+				// If the preview voice font changes, restart playing with the new font.
+				setState(stateCaptureBufferPlayStart);
+			}
+			else if (!mCaptureBufferMode || !mCaptureBufferPlaying || mCaptureBufferRecording)
+			{
+				// Stop playing.
 				captureBufferPlayStopSendMessage();
+				mCaptureBufferPlaying = false;
+
+				// Update UI, should really use a separate callback.
+				notifyVoiceFontObservers(false);
+
 				setState(stateCaptureBufferPaused);
-				notifyVoiceFontObservers();
 			}
 		break;
 
@@ -1723,7 +1755,7 @@ void LLVivoxVoiceClient::stateMachine()
 	{
 		mAudioSessionChanged = false;
 		notifyParticipantObservers();
-		notifyVoiceFontObservers();
+		notifyVoiceFontObservers(false);
 	}
 	else if (mAudioSession && mAudioSession->mParticipantsChanged)
 	{
@@ -3546,7 +3578,11 @@ void LLVivoxVoiceClient::mediaCompletionEvent(std::string &sessionGroupHandle, s
 	}
 	else if (mediaCompletionType == "AuxBufferAudioRender")
 	{
-		mCaptureBufferPlaying = false;
+		// Ignore all but the last stop event
+		if (--mPlayRequestCount <= 0)
+		{
+			mCaptureBufferPlaying = false;
+		}
 	}
 	else
 	{
@@ -6392,7 +6428,7 @@ bool LLVivoxVoiceClient::setVoiceEffect(const LLUUID& id)
 	gSavedPerAccountSettings.setString("VoiceEffectDefault", id.asString());
 
 	sessionSetVoiceFontSendMessage(mAudioSession);
-	notifyVoiceFontObservers();
+	notifyVoiceFontObservers(false);
 
 	return true;
 }
@@ -6669,14 +6705,13 @@ void LLVivoxVoiceClient::accountGetSessionFontsResponse(int statusCode, const st
 	}
 	mVoiceFontsReceived = true;
 
-	notifyVoiceFontObservers(mVoiceFontsNew);
-	mVoiceFontsNew = false;
+	notifyVoiceFontObservers(true);
 }
 
 void LLVivoxVoiceClient::accountGetTemplateFontsResponse(int statusCode, const std::string &statusString)
 {
 	// Voice font list entries were updated via addVoiceFont() during parsing.
-	notifyVoiceFontObservers();
+	notifyVoiceFontObservers(true);
 }
 void LLVivoxVoiceClient::addObserver(LLVoiceEffectObserver* observer)
 {
@@ -6711,49 +6746,58 @@ void LLVivoxVoiceClient::enablePreviewBuffer(bool enable)
 	}
 }
 
-void LLVivoxVoiceClient::recordPreviewBuffer(bool record)
+void LLVivoxVoiceClient::recordPreviewBuffer()
 {
-	if (record && !mCaptureBufferMode)
+	if (!mCaptureBufferMode)
 	{
-		LL_DEBUGS("Voice") << "Cannot start recording, not in preview mode." << LL_ENDL;
+		LL_DEBUGS("Voice") << "Not in voice effect preview mode, cannot start recording." << LL_ENDL;
+		mCaptureBufferRecording = false;
 		return;
 	}
 
-	mCaptureBufferRecording = record;
+	mCaptureBufferRecording = true;
 }
 
-void LLVivoxVoiceClient::playPreviewBuffer(bool play, const LLUUID& effect_id)
+void LLVivoxVoiceClient::playPreviewBuffer(const LLUUID& effect_id)
 {
-	if (play)
+	if (!mCaptureBufferMode)
 	{
-		if (mCaptureBufferMode && mCaptureBufferRecorded)
-		{
-			mPreviewVoiceFontID = effect_id;
-		}
-		else
-		{
-			LL_DEBUGS("Voice") << "No preview buffer to play." << LL_ENDL;
-			return;
-		}
+		LL_DEBUGS("Voice") << "Not in voice effect preview mode, no buffer to play." << LL_ENDL;
+		mCaptureBufferRecording = false;
+		return;
+	}
+
+	if (!mCaptureBufferRecorded)
+	{
+		// Can't play until we have something recorded!
+		mCaptureBufferPlaying = false;
+		return;
 	}
 
-	mCaptureBufferPlaying = play;
+	mPreviewVoiceFont = effect_id;
+	mCaptureBufferPlaying = true;
+}
+
+void LLVivoxVoiceClient::stopPreviewBuffer()
+{
+	mCaptureBufferRecording = false;
+	mCaptureBufferPlaying = false;
 }
 
 bool LLVivoxVoiceClient::isPreviewRecording()
 {
-	return mCaptureBufferRecording;
+	return (mCaptureBufferMode && mCaptureBufferRecording);
 }
 
 bool LLVivoxVoiceClient::isPreviewReady()
 {
-	return mCaptureBufferRecorded;
+	return (mCaptureBufferMode && mCaptureBufferRecorded);
 
 }
 
 bool LLVivoxVoiceClient::isPreviewPlaying()
 {
-	return mCaptureBufferPlaying;
+	return (mCaptureBufferMode && mCaptureBufferPlaying);
 }
 
 void LLVivoxVoiceClient::captureBufferRecordStartSendMessage()
@@ -6811,6 +6855,10 @@ void LLVivoxVoiceClient::captureBufferPlayStartSendMessage(const LLUUID& voice_f
 {
 	if(!mAccountHandle.empty())
 	{
+		// Track how may play requests are sent, so we know how many stop events to
+		// expect before play actually stops.
+		++mPlayRequestCount;
+
 		std::ostringstream stream;
 
 		LL_DEBUGS("Voice") << "Starting audio buffer playback." << LL_ENDL;
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 3c7567610d..6a13bcddb3 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -258,8 +258,9 @@ public:
 	/// @name Effect preview buffer
 	//@{
 	virtual void enablePreviewBuffer(bool enable);
-	virtual void recordPreviewBuffer(bool record);
-	virtual void playPreviewBuffer(bool play, const LLUUID& effect_id = LLUUID::null);
+	virtual void recordPreviewBuffer();
+	virtual void playPreviewBuffer(const LLUUID& effect_id = LLUUID::null);
+	virtual void stopPreviewBuffer();
 
 	virtual bool isPreviewRecording();
 	virtual bool isPreviewReady();
@@ -925,7 +926,9 @@ private:
 	bool mCaptureBufferPlaying;		// A voice sample is being played.
 
 	LLTimer	mCaptureTimer;
-	LLUUID mPreviewVoiceFontID;
+	LLUUID mPreviewVoiceFont;
+	LLUUID mPreviewVoiceFontLast;
+	S32 mPlayRequestCount;
 };
 
 /** 
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index d869f6c610..9a6c21c7f2 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -153,7 +153,7 @@
    top_delta="0"
    width="135">
     <button.commit_callback
-     function="VoiceEffect.Record" />
+     function="VoiceEffect.Stop" />
   </button>
   <button
    follows="left|bottom"
@@ -177,6 +177,6 @@
    top_delta="0"
    width="135">
     <button.commit_callback
-     function="VoiceEffect.Play" />
+     function="VoiceEffect.Stop" />
   </button>
 </floater>
-- 
cgit v1.3


From 6e98ca08300fad1fa8a4a5ab3996e1a6f8318564 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 04:35:31 +0100
Subject: EXT-7337 WIP Voice morph previewing. Remove the activate button in
 the preview floater for now, it doesn't work in capture mode. Remove the
 remains of the play button.

---
 indra/newview/llfloatervoiceeffect.cpp             | 45 +++++++--------
 indra/newview/llfloatervoiceeffect.h               |  2 +-
 .../skins/default/xui/en/floater_voice_effect.xml  | 65 +++-------------------
 3 files changed, 30 insertions(+), 82 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 0fa6135da2..1afea66d91 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -45,7 +45,7 @@ LLFloaterVoiceEffect::LLFloaterVoiceEffect(const LLSD& key)
 	mCommitCallbackRegistrar.add("VoiceEffect.Play",	boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Stop",	boost::bind(&LLFloaterVoiceEffect::onClickStop, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Add",		boost::bind(&LLFloaterVoiceEffect::onClickAdd, this));
-	mCommitCallbackRegistrar.add("VoiceEffect.Activate", boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
+//	mCommitCallbackRegistrar.add("VoiceEffect.Activate", boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
 }
 
 // virtual
@@ -70,7 +70,7 @@ BOOL LLFloaterVoiceEffect::postBuild()
 	if (mVoiceEffectList)
 	{
 		mVoiceEffectList->setCommitCallback(boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
-		mVoiceEffectList->setDoubleClickCallback(boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
+//		mVoiceEffectList->setDoubleClickCallback(boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
 	}
 
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
@@ -133,7 +133,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		element["columns"][0]["column"] = "name";
 		element["columns"][0]["value"] = getString("no_voice_effect");
 		element["columns"][0]["font"]["name"] = "SANSSERIF";
-		element["columns"][0]["font"]["style"] = "BOLD";
+		element["columns"][0]["font"]["style"] = "ITALIC";
 
 		LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM);
 		// *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :(
@@ -152,9 +152,16 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			std::string effect_name = it->first;
 
 			LLSD effect_properties = effect_interface->getVoiceEffectProperties(effect_id);
+
+			// Tag the active effect.
+			if (effect_id == LLVoiceClient::instance().getVoiceEffectDefault())
+			{
+				effect_name += " " + getString("active_voice_effect");
+			}
+
+			std::string expiry_date = effect_properties["expiry_date"].asString();
 			bool is_template_only = effect_properties["template_only"].asBoolean();
 			bool is_new = effect_properties["is_new"].asBoolean();
-			std::string expiry_date = effect_properties["expiry_date"].asString();
 
 			std::string font_style = "NORMAL";
 			if (!is_template_only)
@@ -168,6 +175,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			element["columns"][0]["value"] = effect_name;
 			element["columns"][0]["font"]["name"] = "SANSSERIF";
 			element["columns"][0]["font"]["style"] = font_style;
+
 			element["columns"][1]["column"] = "new";
 			element["columns"][1]["value"] = is_new ? getString("new_voice_effect") : "";
 			element["columns"][1]["font"]["name"] = "SANSSERIF";
@@ -194,8 +202,6 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		mVoiceEffectList->selectByID(*it);
 	}
 	mVoiceEffectList->setScrollPos(scroll_pos);
-
-	mVoiceEffectList->setValue(effect_interface->getVoiceEffect());
 	mVoiceEffectList->setEnabled(true);
 }
 
@@ -213,16 +219,6 @@ void LLFloaterVoiceEffect::updateControls()
 
 	getChild<LLButton>("record_btn")->setVisible(!recording);
 	getChild<LLButton>("record_stop_btn")->setVisible(recording);
-
-	getChild<LLButton>("play_btn")->setVisible(!playing);
-	getChild<LLButton>("play_stop_btn")->setVisible(playing);
-
-	getChild<LLButton>("play_btn")->setEnabled(effect_interface->isPreviewReady());
-
-	if (!mVoiceEffectList)
-	{
-		mVoiceEffectList->setValue(effect_interface->getVoiceEffect());
-	}
 }
 
 // virtual
@@ -281,11 +277,12 @@ void LLFloaterVoiceEffect::onClickAdd()
 	LLWeb::loadURL(getString("get_voice_effects_url"));
 }
 
-void LLFloaterVoiceEffect::onClickActivate()
-{
-	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-	if (effect_interface && mVoiceEffectList)
-	{
-		effect_interface->setVoiceEffect(mVoiceEffectList->getCurrentID());
-	}
-}
+//void LLFloaterVoiceEffect::onClickActivate()
+//{
+//	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
+//	if (effect_interface && mVoiceEffectList)
+//	{
+//		effect_interface->setVoiceEffect(mVoiceEffectList->getCurrentID());
+//	}
+//}
+
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index 060ffc99e9..ed38cd6925 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -63,7 +63,7 @@ private:
 	void onClickPlay();
 	void onClickStop();
  	void onClickAdd();
- 	void onClickActivate();
+// 	void onClickActivate();
 
 	LLUUID mSelectedID;
 	LLScrollListCtrl* mVoiceEffectList;
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index d0c503f7b8..728beece6b 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -14,11 +14,14 @@
  min_width="240"
  width="313">
   <string name="no_voice_effect">
-    No Voice Effect
+    (No Voice Effect)
   </string>
   <string name="get_voice_effects_url">
     http://secondlife.com/landing/v0icem0rphingt3st
   </string>
+  <string name="active_voice_effect">
+    (Active)
+  </string>
   <string name="new_voice_effect">
     New!
   </string>
@@ -38,8 +41,8 @@
     <scroll_list.columns
      label="New"
      name="new"
-     width="48" />
-	<scroll_list.columns
+     width="64" />
+    <scroll_list.columns
      label="Expires"
      name="expires"
      width="100" />
@@ -86,6 +89,7 @@
       <button.commit_callback
        function="VoiceEffect.Add" />
     </button>
+<!--
     <button
      follows="bottom|left"
      font="SansSerifBigBold"
@@ -102,35 +106,8 @@
       <button.commit_callback
        function="VoiceEffect.Activate" />
     </button>
+-->
   </panel>
-<!--  <panel
-   background_visible="true"
-   bevel_style="none"
-   top_pad="0"
-   follows="left|right|bottom"
-   height="30"
-   label="bottom_panel"
-   layout="topleft"
-   left="0"
-   name="bottom_panel"
-   width="313">
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="10"
-     image_hover_selected="Activate_Checkmark"
-     image_selected="Activate_Checkmark"
-     image_unselected="Activate_Checkmark"
-     layout="topleft"
-     left="10"
-     name="activate_btn"
-     tool_tip="Activate/Deactivate selected voice effect"
-     top="10"
-     width="10"
-      <button.commit_callback
-       function="VoiceEffect.Activate" />
-    </button>
-  </panel> -->
   <button
    follows="left|bottom"
    height="23"
@@ -155,30 +132,4 @@
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
-<!--
-  <button
-   follows="left|bottom"
-   height="23"
-   label="Play Preview"
-   layout="topleft"
-   left_pad="6"
-   name="play_btn"
-   top_delta="0"
-   width="135">
-    <button.commit_callback
-     function="VoiceEffect.Play" />
-  </button>
-  <button
-   follows="left|bottom"
-   height="23"
-   label="Stop"
-   layout="topleft"
-   left_delta="0"
-   name="play_stop_btn"
-   top_delta="0"
-   width="135">
-    <button.commit_callback
-     function="VoiceEffect.Stop" />
-  </button>
--->
 </floater>
-- 
cgit v1.3


From 234b3edc26db7cf87a11fc16d9720bf4a9c20177 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 14:11:48 +0100
Subject: EXT-7337 WIP Added explanatory note to the voice morph preview
 floater

---
 indra/newview/llfloatervoiceeffect.cpp              |  2 ++
 .../skins/default/xui/en/floater_voice_effect.xml   | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 1afea66d91..49dd6fa4d9 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -65,6 +65,8 @@ LLFloaterVoiceEffect::~LLFloaterVoiceEffect()
 BOOL LLFloaterVoiceEffect::postBuild()
 {
 	setDefaultBtn("record_btn");
+	getChild<LLButton>("record_btn")->setFocus(true);
+
 
 	mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list");
 	if (mVoiceEffectList)
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 728beece6b..acd70bce8e 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="465"
+ height="415"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -26,12 +26,13 @@
     New!
   </string>
   <scroll_list
-   bottom_delta="400"
+   bottom_delta="300"
    draw_heading="true"
    follows="all"
    layout="topleft"
    left="0"
    multi_select="false"
+   tool_tip="Record a sample of your voice, then click an effect to preview."
    top="20"
    name="voice_effect_list">
     <scroll_list.columns
@@ -108,6 +109,21 @@
     </button>
 -->
   </panel>
+  <text
+   height="40"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   text_color="LabelSelectedDisabledColor"
+   length="1"
+   follows="left|bottom|right"
+   layout="topleft"
+   left="6"
+   name="status_text"
+   top_pad="10"
+   width="300">
+    Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
+  </text>
   <button
    follows="left|bottom"
    height="23"
@@ -115,6 +131,7 @@
    layout="topleft"
    left="6"
    name="record_btn"
+   tool_tip="Record a sample of your voice."
    top_pad="5"
    width="135">
     <button.commit_callback
-- 
cgit v1.3


From 08e610adfa8124fa7b990f952ad3053b955b62d3 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Sun, 23 May 2010 19:44:30 +0100
Subject: EXT-7335 WIP Parse Vivox voice font expiry timestamps into ISO 8601
 standard dates.

---
 indra/newview/llfloatervoiceeffect.cpp | 10 +++++++--
 indra/newview/llvoicevivox.cpp         | 40 +++++++++++++++++++++++++++++-----
 indra/newview/llvoicevivox.h           |  8 +++----
 3 files changed, 46 insertions(+), 12 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 49dd6fa4d9..38c419ab24 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -161,7 +161,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 				effect_name += " " + getString("active_voice_effect");
 			}
 
-			std::string expiry_date = effect_properties["expiry_date"].asString();
+			LLDate expiry_date = effect_properties["expiry_date"].asDate();
 			bool is_template_only = effect_properties["template_only"].asBoolean();
 			bool is_new = effect_properties["is_new"].asBoolean();
 
@@ -184,7 +184,13 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			element["columns"][1]["font"]["style"] = font_style;
 
 			element["columns"][2]["column"] = "expires";
-			element["columns"][2]["value"] = !is_template_only ? expiry_date : "";
+			if (!is_template_only)
+			{
+				element["columns"][2]["value"] = expiry_date;
+			}
+			else {
+				element["columns"][2]["value"] = "";
+			}
 			element["columns"][2]["font"]["name"] = "SANSSERIF";
 			element["columns"][2]["font"]["style"] = font_style;
 
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index e00b94b421..304321b361 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -6508,7 +6508,7 @@ const voice_effect_list_t& LLVivoxVoiceClient::getVoiceEffectTemplateList() cons
 void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
 								 const std::string &name,
 								 const std::string &description,
-								 const std::string &expiration_date,
+								 const LLDate &expiration_date,
 								 const bool has_expired,
 								 const S32 font_type,
 								 const S32 font_status,
@@ -7112,7 +7112,7 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
 				id = 0;
 				nameString.clear();
 				descriptionString.clear();
-				expirationDateString.clear();
+				expirationDate = LLDate();
 				hasExpired = false;
 				fontType = 0;
 				fontStatus = 0;
@@ -7122,7 +7122,7 @@ void LLVivoxProtocolParser::StartTag(const char *tag, const char **attr)
 				id = 0;
 				nameString.clear();
 				descriptionString.clear();
-				expirationDateString.clear();
+				expirationDate = LLDate();
 				hasExpired = false;
 				fontType = 0;
 				fontStatus = 0;
@@ -7278,11 +7278,11 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
 			subscriptionType = string;
 		else if (!stricmp("SessionFont", tag))
 		{
-			LLVivoxVoiceClient::getInstance()->addVoiceFont(id, nameString, descriptionString, expirationDateString, hasExpired, fontType, fontStatus, false);
+			LLVivoxVoiceClient::getInstance()->addVoiceFont(id, nameString, descriptionString, expirationDate, hasExpired, fontType, fontStatus, false);
 		}
 		else if (!stricmp("TemplateFont", tag))
 		{
-			LLVivoxVoiceClient::getInstance()->addVoiceFont(id, nameString, descriptionString, expirationDateString, hasExpired, fontType, fontStatus, true);
+			LLVivoxVoiceClient::getInstance()->addVoiceFont(id, nameString, descriptionString, expirationDate, hasExpired, fontType, fontStatus, true);
 		}
 		else if (!stricmp("ID", tag))
 		{
@@ -7294,7 +7294,7 @@ void LLVivoxProtocolParser::EndTag(const char *tag)
 		}
 		else if (!stricmp("ExpirationDate", tag))
 		{
-			expirationDateString = string;
+			expirationDate = vivoxTimeStampToLLDate(string);
 		}
 		else if (!stricmp("Expired", tag))
 		{
@@ -7341,6 +7341,34 @@ void LLVivoxProtocolParser::CharData(const char *buffer, int length)
 
 // --------------------------------------------------------------------------------
 
+LLDate LLVivoxProtocolParser::vivoxTimeStampToLLDate(const std::string& vivox_ts)
+{
+	// First check to see if it actually already is a proper ISO8601 date,
+	// in case the format miraculously changes in future ;)
+	LLDate ts(vivox_ts);
+	if (ts.notNull())
+	{
+		return ts;
+	}
+
+	std::string time_stamp = vivox_ts;
+
+	// Vivox's format is missing a T from being standard ISO 8601,
+	// so add it.  It is the only space in their result.
+	LLStringUtil::replaceChar(time_stamp, ' ', 'T');
+
+	//also need to remove the hours away from GMT to be compatible
+	//with LLDate as well as the fractions of seconds
+	time_stamp = time_stamp.substr(0, time_stamp.length() - 5);
+
+	//it also needs a 'Z' at the end
+	time_stamp += "Z";
+
+	return LLDate(time_stamp);
+}
+
+// --------------------------------------------------------------------------------
+
 void LLVivoxProtocolParser::processResponse(std::string tag)
 {
 	LL_DEBUGS("VivoxProtocolParser") << tag << LL_ENDL;
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index f67798c207..130fdac146 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -664,7 +664,7 @@ protected:
 	void addVoiceFont(const S32 id,
 					  const std::string &name,
 					  const std::string &description,
-					  const std::string &expiration_date,
+					  const LLDate &expiration_date,
 					  const bool has_expired,
 					  const S32 font_type,
 					  const S32 font_status,
@@ -893,7 +893,7 @@ private:
 		LLUUID		mID;
 		S32			mFontIndex;
 		std::string mName;
-		std::string mExpirationDate;
+		LLDate		mExpirationDate;
 		bool		mHasExpired;
 		S32			mFontType;
 		S32			mFontStatus;
@@ -1016,7 +1016,7 @@ protected:
 	std::string		subscriptionType;
 	S32				id;
 	std::string		descriptionString;
-	std::string		expirationDateString;
+	LLDate			expirationDate;
 	bool			hasExpired;
 	S32				fontType;
 	S32				fontStatus;
@@ -1037,7 +1037,7 @@ protected:
 	void			StartTag(const char *tag, const char **attr);
 	void			EndTag(const char *tag);
 	void			CharData(const char *buffer, int length);
-	
+	LLDate			vivoxTimeStampToLLDate(const std::string& vivox_ts);
 };
 
 
-- 
cgit v1.3


From 12171ddba3c70b73e53bf103a45779262b38c6ec Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 00:20:03 +0100
Subject: EXT-7336 WIP Move the Voice Morphing marketing URL into strings.xml
 so it can be used in notifications as well.

---
 indra/newview/llfloatervoiceeffect.cpp                      |  2 +-
 indra/newview/llpanelvoiceeffect.cpp                        |  3 ++-
 indra/newview/skins/default/xui/en/floater_voice_effect.xml |  3 ---
 indra/newview/skins/default/xui/en/panel_voice_effect.xml   |  3 ---
 indra/newview/skins/default/xui/en/strings.xml              | 10 ++++++----
 5 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 38c419ab24..e30a50fab7 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -282,7 +282,7 @@ void LLFloaterVoiceEffect::onClickStop()
 void LLFloaterVoiceEffect::onClickAdd()
 {
 	// Open the voice morphing info web page
-	LLWeb::loadURL(getString("get_voice_effects_url"));
+	LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
 }
 
 //void LLFloaterVoiceEffect::onClickActivate()
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
index 915d547056..140feb7a54 100644
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ b/indra/newview/llpanelvoiceeffect.cpp
@@ -38,6 +38,7 @@
 #include "llcombobox.h"
 #include "llfloaterreg.h"
 #include "llpanel.h"
+#include "lltrans.h"
 #include "llvoiceclient.h"
 
 static LLRegisterPanelClassWrapper<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect");
@@ -98,7 +99,7 @@ void LLPanelVoiceEffect::onCommitVoiceEffect()
 	else if (value.asInteger() == GET_VOICE_EFFECTS)
 	{
 		// Open the voice morphing info web page
-		LLWeb::loadURL(getString("get_voice_effects_url"));
+		LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
 	}
 	else
 	{
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index acd70bce8e..7335488e73 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -16,9 +16,6 @@
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
-  <string name="get_voice_effects_url">
-    http://secondlife.com/landing/v0icem0rphingt3st
-  </string>
   <string name="active_voice_effect">
     (Active)
   </string>
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 9e5652d1e2..9b6548ef9c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -8,9 +8,6 @@
   <string name="no_voice_effect">
     No Voice Effect
   </string>
-  <string name="get_voice_effects_url">
-    http://secondlife.com/landing/v0icem0rphingt3st
-  </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
   </string>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index f8bb36b88a..a54dd02927 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3086,10 +3086,12 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
   <string name="unread_chat_multiple">
     [SOURCES] have said something new
   </string>"
-	<string name="session_initialization_timed_out_error">
-		The session initialization is timed out
-	</string>
-  
+  <string name="session_initialization_timed_out_error">
+    The session initialization is timed out
+  </string>
+
+  <string name="voice_morphing_url">http://secondlife.com/landing/v0icem0rphingt3st</string>
+
   <!-- Financial operations strings -->
   <string name="paid_you_ldollars">[NAME] paid you L$[AMOUNT]</string>
   <string name="you_paid_ldollars">You paid [NAME] L$[AMOUNT] [REASON].</string>
-- 
cgit v1.3


From 15c3b2c6309fa4b45376f3d62e33bfcd3ccdbfc7 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 02:27:07 +0100
Subject: EXT-7335 WIP Added notification of expiring voice effects

---
 indra/newview/app_settings/settings.xml            |  11 ++
 indra/newview/llfloaternotificationsconsole.cpp    |   2 +-
 indra/newview/llfloatervoiceeffect.cpp             |   4 +-
 indra/newview/llfloatervoiceeffect.h               |   2 +-
 indra/newview/llpanelvoiceeffect.cpp               |   2 +-
 indra/newview/llpanelvoiceeffect.h                 |   2 +-
 indra/newview/llvoiceclient.h                      |   2 +-
 indra/newview/llvoicevivox.cpp                     | 187 +++++++++++++++++++--
 indra/newview/llvoicevivox.h                       |  13 +-
 .../newview/skins/default/xui/en/notifications.xml |  33 ++++
 10 files changed, 232 insertions(+), 26 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index dd5774929e..cb9177587f 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10606,6 +10606,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>VoiceEffectExpiryWarningTime</key>
+    <map>
+      <key>Comment</key>
+      <string>How much notice to give of voice effect subscriptions expiry, in seconds.</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>F32</string>
+      <key>Value</key>
+      <real>259200.0</real>
+    </map>
     <key>AutoDisengageMic</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloaternotificationsconsole.cpp b/indra/newview/llfloaternotificationsconsole.cpp
index b744bff084..105d7f9201 100644
--- a/indra/newview/llfloaternotificationsconsole.cpp
+++ b/indra/newview/llfloaternotificationsconsole.cpp
@@ -184,7 +184,7 @@ BOOL LLFloaterNotificationConsole::postBuild()
 	addChannel("Ignore");
 	addChannel("Visible", true);
 	// all the ones below attach to the Visible channel
-	addChannel("History");
+	addChannel("Persistent");
 	addChannel("Alerts");
 	addChannel("AlertModal");
 	addChannel("Group Notifications");
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index e30a50fab7..f31ab96985 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -230,9 +230,9 @@ void LLFloaterVoiceEffect::updateControls()
 }
 
 // virtual
-void LLFloaterVoiceEffect::onVoiceEffectChanged(bool new_effects)
+void LLFloaterVoiceEffect::onVoiceEffectChanged(bool effect_list_updated)
 {
-	if (new_effects)
+	if (effect_list_updated)
 	{
 		refreshEffectList();
 	}
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index ed38cd6925..46b241bd17 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -57,7 +57,7 @@ private:
 	void updateControls();
 
 	/// Called by voice effect provider when voice effect list is changed.
-	virtual void onVoiceEffectChanged(bool new_effects);
+	virtual void onVoiceEffectChanged(bool effect_list_updated);
 
 	void onClickRecord();
 	void onClickPlay();
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
index 140feb7a54..4f73f38edc 100644
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ b/indra/newview/llpanelvoiceeffect.cpp
@@ -110,7 +110,7 @@ void LLPanelVoiceEffect::onCommitVoiceEffect()
 }
 
 // virtual
-void LLPanelVoiceEffect::onVoiceEffectChanged(bool new_effects)
+void LLPanelVoiceEffect::onVoiceEffectChanged(bool effect_list_updated)
 {
 	update();
 }
diff --git a/indra/newview/llpanelvoiceeffect.h b/indra/newview/llpanelvoiceeffect.h
index 008123a4e4..bd7bdd04f2 100644
--- a/indra/newview/llpanelvoiceeffect.h
+++ b/indra/newview/llpanelvoiceeffect.h
@@ -56,7 +56,7 @@ private:
 	void update();
 
 	/// Called by voice effect provider when voice effect list is changed.
-	virtual void onVoiceEffectChanged(bool new_effects);
+	virtual void onVoiceEffectChanged(bool effect_list_updated);
 
 	// Fixed entries in the voice effect list
 	typedef enum e_voice_effect_combo_items
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index 7f8f979da0..744ec84023 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -266,7 +266,7 @@ class LLVoiceEffectObserver
 {
 public:
 	virtual ~LLVoiceEffectObserver() { }
-	virtual void onVoiceEffectChanged(bool new_effects) = 0;
+	virtual void onVoiceEffectChanged(bool effect_list_updated) = 0;
 };
 
 typedef std::multimap<const std::string, const LLUUID, LLDictionaryLess> voice_effect_list_t;
diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 304321b361..d786b4d928 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -60,6 +60,7 @@
 #include "llviewerparcelmgr.h"
 //#include "llfirstuse.h"
 #include "llspeakers.h"
+#include "lltrans.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
 
@@ -96,6 +97,9 @@ const int MAX_LOGIN_RETRIES = 12;
 // blocked is VERY rare and it's better to sacrifice response time in this situation for the sake of stability.
 const int MAX_NORMAL_JOINING_SPATIAL_NUM = 50;
 
+// How often to check for expired voice fonts
+const F32 VOICE_FONT_EXPIRY_INTERVAL = 1.f;
+
 // Maximum length of capture buffer recordings
 const F32 CAPTURE_BUFFER_MAX_TIME = 15.f;
 
@@ -781,7 +785,7 @@ void LLVivoxVoiceClient::stateMachine()
 			closeSocket();
 			deleteAllSessions();
 			deleteAllBuddies();
-			deleteVoiceFonts();
+			deleteAllVoiceFonts();
 			deleteVoiceFontTemplates();
 
 			mConnectorHandle.clear();
@@ -1372,6 +1376,10 @@ void LLVivoxVoiceClient::stateMachine()
 			
 		//MARK: stateVoiceFontsReceived
 		case stateVoiceFontsReceived:	// Voice font list received
+			// Set up the timer to check for expiring voice fonts
+			mVoiceFontExpiryTimer.start();
+			mVoiceFontExpiryTimer.setTimerExpirySec(VOICE_FONT_EXPIRY_INTERVAL);
+
 #if USE_SESSION_GROUPS			
 			// create the main session group
 			setState(stateCreatingSessionGroup);
@@ -1600,6 +1608,13 @@ void LLVivoxVoiceClient::stateMachine()
 					enforceTether();
 				}
 				
+				// Do notifications for expiring Voice Fonts.
+				if (mVoiceFontExpiryTimer.hasExpired())
+				{
+					expireVoiceFonts();
+					mVoiceFontExpiryTimer.setTimerExpirySec(VOICE_FONT_EXPIRY_INTERVAL);
+				}
+
 				// Send an update only if the ptt or mute state has changed (which shouldn't be able to happen that often
 				// -- the user can only click so fast) or every 10hz, whichever is sooner.
 				// Sending for every volume update causes an excessive flood of messages whenever a volume slider is dragged.
@@ -1669,7 +1684,7 @@ void LLVivoxVoiceClient::stateMachine()
 			mAccountHandle.clear();
 			deleteAllSessions();
 			deleteAllBuddies();
-			deleteVoiceFonts();
+			deleteAllVoiceFonts();
 			deleteVoiceFontTemplates();
 
 			if(mVoiceEnabled && !mRelogRequested)
@@ -6461,7 +6476,6 @@ LLSD LLVivoxVoiceClient::getVoiceEffectProperties(const LLUUID& id)
 
 	voiceFontEntry *font = iter->second;
 	sd["name"] = font->mName;
-	sd["expired"] = font->mHasExpired;
 	sd["expiry_date"] = font->mExpirationDate;
 	sd["is_new"] = font->mIsNew;
 
@@ -6471,7 +6485,6 @@ LLSD LLVivoxVoiceClient::getVoiceEffectProperties(const LLUUID& id)
 LLVivoxVoiceClient::voiceFontEntry::voiceFontEntry(LLUUID& id) :
 	mID(id),
 	mFontIndex(0),
-	mHasExpired(false),
 	mFontType(VOICE_FONT_TYPE_NONE),
 	mFontStatus(VOICE_FONT_STATUS_NONE),
 	mIsNew(false)
@@ -6487,7 +6500,7 @@ void LLVivoxVoiceClient::refreshVoiceEffectLists(bool clear_lists)
 	if (clear_lists)
 	{
 		mVoiceFontsReceived = false;
-		deleteVoiceFonts();
+		deleteAllVoiceFonts();
 		deleteVoiceFontTemplates();
 	}
 
@@ -6533,12 +6546,23 @@ void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
 	voice_font_map_t& font_map = template_font ? mVoiceFontTemplateMap : mVoiceFontMap;
 	voice_effect_list_t& font_list = template_font ? mVoiceFontTemplateList : mVoiceFontList;
 
-	// Check whether we've seen this font before and create an entry for it if not.
+	// Check whether we've seen this font before.
 	voice_font_map_t::iterator iter = font_map.find(font_id);
 	bool new_font = (iter == font_map.end());
+
+	// If it is a new (unexpired) font create a new entry, otherwise update the existing one.
 	if (new_font)
 	{
-		font = new voiceFontEntry(font_id);
+		if (!has_expired)
+		{
+			font = new voiceFontEntry(font_id);
+		}
+		else
+		{
+			LL_DEBUGS("Voice") << (template_font?"Template: ":"") << font_id
+			<< " (" << font_index << ") : " << name << " has expired." << LL_ENDL;
+		}
+
 	}
 	else
 	{
@@ -6547,15 +6571,47 @@ void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
 
 	if (font)
 	{
+		// Remove fonts that have expired since we last saw them.
+		if (has_expired)
+		{
+			LL_DEBUGS("Voice") << (template_font?"Template: ":"") << font_id
+			<< " (" << font_index << ") : " << name << " has expired, removing."
+			<< LL_ENDL;
+
+			deleteVoiceFont(font_id);
+			return;
+		}
+
 		font->mFontIndex = font_index;
 		// Use the description for the human readable name if available, as the
 		// "name" may be a UUID.
 		font->mName = description.empty() ? name : description;
 		font->mExpirationDate = expiration_date;
-		font->mHasExpired = has_expired;
 		font->mFontType = font_type;
 		font->mFontStatus = font_status;
 
+		F64 expiry_time = 0.f;
+
+		// Set the expiry timer to trigger a notification when the voice font can no longer be used.
+		font->mExpiryTimer.start();
+		expiry_time = expiration_date.secondsSinceEpoch() - LLTimer::getTotalSeconds();
+		font->mExpiryTimer.setTimerExpirySec(expiry_time);
+
+		// Set the warning timer to some interval before actual expiry.
+		F64 warning_time = (F64)gSavedSettings.getF32("VoiceEffectExpiryWarningTime");
+		if (warning_time > 0.f)
+		{
+			font->mExpiryWarningTimer.start();
+			expiry_time = (expiration_date.secondsSinceEpoch() - warning_time)
+							- LLTimer::getTotalSeconds();
+			font->mExpiryWarningTimer.setTimerExpirySec(expiry_time);
+		}
+		else
+		{
+			// Disable the warning timer.
+			font->mExpiryWarningTimer.stop();
+		}
+
 		 // Only flag it as a new font if we have already seen the font list.
 		if (!template_font && mVoiceFontsReceived && new_font)
 		{
@@ -6563,9 +6619,16 @@ void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
 			mVoiceFontsNew = true;
 		}
 
+		if (new_font)
+		{
+			font_map.insert(voice_font_map_t::value_type(font->mID, font));
+			font_list.insert(voice_effect_list_t::value_type(font->mName, font->mID));
+		}
+
+		// Debugging stuff
+
 		LL_DEBUGS("Voice") << (template_font?"Template: ":"") << font_id
-			<< " (" << font_index << ") : " << name << (has_expired?" (Expired)":"")
-			<< LL_ENDL;
+		<< " (" << font_index << ") : " << name << LL_ENDL;
 
 		if (font_type < VOICE_FONT_TYPE_NONE || font_type >= VOICE_FONT_TYPE_UNKNOWN)
 		{
@@ -6575,16 +6638,108 @@ void LLVivoxVoiceClient::addVoiceFont(const S32 font_index,
 		{
 			LL_DEBUGS("Voice") << "Unknown voice font status: " << font_status << LL_ENDL;
 		}
+	}
+}
 
-		if (new_font)
+void LLVivoxVoiceClient::expireVoiceFonts()
+{
+	// *TODO: If we are selling voice fonts in packs, there are probably
+	// going to be a number of fonts with the same expiration time, so would
+	// be more efficient to just keep a list of expiration times rather
+	// than checking each font individually.
+
+	bool have_expired = false;
+	bool will_expire = false;
+	bool expired_in_use = false;
+
+	LLUUID current_effect = LLVoiceClient::instance().getVoiceEffectDefault();
+
+	voice_font_map_t::iterator iter;
+	for (iter = mVoiceFontMap.begin(); iter != mVoiceFontMap.end(); ++iter)
+	{
+		voiceFontEntry* voice_font = iter->second;
+		LLTimer& expiry_timer  = voice_font->mExpiryTimer;
+		LLTimer& warning_timer = voice_font->mExpiryWarningTimer;
+
+		// Check for expired voice fonts
+		if (expiry_timer.getStarted() && expiry_timer.hasExpired())
 		{
-			font_map.insert(voice_font_map_t::value_type(font->mID, font));
-			font_list.insert(voice_effect_list_t::value_type(font->mName, font->mID));
+			// Check whether it is the active voice font
+			if (voice_font->mID == current_effect)
+			{
+				// Reset to no voice effect.
+				setVoiceEffect(LLUUID::null);
+				expired_in_use = true;
+			}
+			deleteVoiceFont(voice_font->mID);
+			have_expired = true;
+		}
+
+		// Check for voice fonts that will expire in less that the warning time
+		if (warning_timer.getStarted() && warning_timer.hasExpired())
+		{
+			will_expire = true;
+			warning_timer.stop();
+		}
+	}
+
+	LLSD args;
+	args["URL"] = LLTrans::getString("voice_morphing_url");
+
+	// Give a notification if any voice fonts have expired.
+	if (have_expired)
+	{
+		if (expired_in_use)
+		{
+			LLNotificationsUtil::add("VoiceEffectsExpiredInUse", args);
+		}
+		else
+		{
+			LLNotificationsUtil::add("VoiceEffectsExpired", args);
+		}
+
+		// Refresh voice font lists in the UI.
+		notifyVoiceFontObservers(true);
+	}
+
+	// Give a warning notification if any voice fonts are due to expire.
+	if (will_expire)
+	{
+		S32 seconds = gSavedSettings.getF32("VoiceEffectExpiryWarningTime");
+		args["INTERVAL"] = llformat("%d", (seconds / SEC_PER_DAY));
+
+		LLNotificationsUtil::add("VoiceEffectsWillExpire", args);
+	}
+}
+
+void LLVivoxVoiceClient::deleteVoiceFont(const LLUUID& id)
+{
+	// Remove the entry from the voice font list.
+	voice_effect_list_t::iterator list_iter = mVoiceFontList.begin();
+	while (list_iter != mVoiceFontList.end())
+	{
+		if (list_iter->second == id)
+		{
+			mVoiceFontList.erase(list_iter++);
+		}
+		else
+		{
+			++list_iter;
 		}
 	}
+
+	// Find the entry in the voice font map and erase its data.
+	voice_font_map_t::iterator map_iter = mVoiceFontMap.find(id);
+	if (map_iter != mVoiceFontMap.end())
+	{
+		delete map_iter->second;
+	}
+
+	// Remove the entry from the voice font map.
+	mVoiceFontMap.erase(map_iter);
 }
 
-void LLVivoxVoiceClient::deleteVoiceFonts()
+void LLVivoxVoiceClient::deleteAllVoiceFonts()
 {
 	mVoiceFontList.clear();
 
@@ -6723,14 +6878,14 @@ void LLVivoxVoiceClient::removeObserver(LLVoiceEffectObserver* observer)
 	mVoiceFontObservers.erase(observer);
 }
 
-void LLVivoxVoiceClient::notifyVoiceFontObservers(bool new_fonts)
+void LLVivoxVoiceClient::notifyVoiceFontObservers(bool lists_changed)
 {
 	for (voice_font_observer_set_t::iterator it = mVoiceFontObservers.begin();
 		 it != mVoiceFontObservers.end();
 		 )
 	{
 		LLVoiceEffectObserver* observer = *it;
-		observer->onVoiceEffectChanged(new_fonts);
+		observer->onVoiceEffectChanged(lists_changed);
 		// In case onVoiceEffectChanged() deleted an entry.
 		it = mVoiceFontObservers.upper_bound(observer);
 	}
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h
index 130fdac146..d71fe132c5 100644
--- a/indra/newview/llvoicevivox.h
+++ b/indra/newview/llvoicevivox.h
@@ -857,7 +857,9 @@ private:
 
 	// Voice Fonts
 
-	void deleteVoiceFonts();
+	void expireVoiceFonts();
+	void deleteVoiceFont(const LLUUID& id);
+	void deleteAllVoiceFonts();
 	void deleteVoiceFontTemplates();
 
 	S32 getVoiceFontIndex(const LLUUID& id) const;
@@ -867,7 +869,7 @@ private:
 	void accountGetTemplateFontsSendMessage();
 	void sessionSetVoiceFontSendMessage(sessionState *session);
 
-	void notifyVoiceFontObservers(bool new_fonts = false);
+	void notifyVoiceFontObservers(bool lists_changed = false);
 
 	typedef enum e_voice_font_type
 	{
@@ -894,10 +896,12 @@ private:
 		S32			mFontIndex;
 		std::string mName;
 		LLDate		mExpirationDate;
-		bool		mHasExpired;
 		S32			mFontType;
 		S32			mFontStatus;
 		bool		mIsNew;
+
+		LLTimer		mExpiryTimer;
+		LLTimer		mExpiryWarningTimer;
 	};
 
 	bool mVoiceFontsReceived;
@@ -912,6 +916,9 @@ private:
 	typedef std::set<LLVoiceEffectObserver*> voice_font_observer_set_t;
 	voice_font_observer_set_t mVoiceFontObservers;
 
+	LLTimer	mVoiceFontExpiryTimer;
+
+
 	// Audio capture buffer
 
 	void captureBufferRecordStartSendMessage();
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 999f804e71..6b5659f6c0 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5956,6 +5956,39 @@ We are creating a voice channel for you. This may take up to one minute.
     <unique/>
   </notification>
 
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsExpired"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+Subscribed Voice Effects have expired.
+[[URL] Renew your subscription] to reactivate them.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsExpiredInUse"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+The active Voice Effect has expired, your normal voice settings have been applied.
+[[URL] Renew your subscription] to reactivate it.
+    <unique/>
+  </notification>
+
+  <notification
+   icon="notify.tga"
+   name="VoiceEffectsWillExpire"
+   sound="UISndAlert"
+   persist="true"
+   type="notify">
+Voice Effects will expire in less than [INTERVAL] days.
+[[URL] Renew your subscription] or they will be removed.
+    <unique/>
+  </notification>
+
   <notification
    icon="notifytip.tga"
    name="Cannot enter parcel: not a group member"
-- 
cgit v1.3


From a48c8a3aca6f2c174e2d49b26a63946a1bf4cea7 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 16:30:22 +0100
Subject: EXT-7138 WIP More tidying up after the removal of the play button in
 the voice effect preview.

---
 indra/newview/llfloatervoiceeffect.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index f31ab96985..bd469a85da 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -216,13 +216,11 @@ void LLFloaterVoiceEffect::refreshEffectList()
 void LLFloaterVoiceEffect::updateControls()
 {
 	bool recording = false;
-	bool playing = false;
 
 	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 	if (effect_interface)
 	{
 		recording = effect_interface->isPreviewRecording();
-		playing = effect_interface->isPreviewPlaying();
 	}
 
 	getChild<LLButton>("record_btn")->setVisible(!recording);
-- 
cgit v1.3


From cf34437506cabdc54466cdf5010979a61a99154b Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Mon, 24 May 2010 21:29:09 +0100
Subject: EXT-7337 WIP Rearrange controls in the voice morphing preview. Added
 link to marketing page.

---
 indra/newview/llfloatervoiceeffect.cpp             |   2 +-
 .../skins/default/xui/en/floater_voice_effect.xml  | 141 +++++++--------------
 2 files changed, 47 insertions(+), 96 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index bd469a85da..9529f947c1 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -66,7 +66,7 @@ BOOL LLFloaterVoiceEffect::postBuild()
 {
 	setDefaultBtn("record_btn");
 	getChild<LLButton>("record_btn")->setFocus(true);
-
+	childSetTextArg("voice_morphing_link", "[URL]", LLTrans::getString("voice_morphing_url"));
 
 	mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list");
 	if (mVoiceEffectList)
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 7335488e73..73e4a694eb 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="415"
+ height="400"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -12,7 +12,7 @@
  layout="topleft"
  min_height="350"
  min_width="240"
- width="313">
+ width="300">
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
@@ -22,111 +22,25 @@
   <string name="new_voice_effect">
     New!
   </string>
-  <scroll_list
-   bottom_delta="300"
-   draw_heading="true"
-   follows="all"
-   layout="topleft"
-   left="0"
-   multi_select="false"
-   tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="20"
-   name="voice_effect_list">
-    <scroll_list.columns
-     label="Name"
-     name="name"
-     width="153" />
-    <scroll_list.columns
-     label="New"
-     name="new"
-     width="64" />
-    <scroll_list.columns
-     label="Expires"
-     name="expires"
-     width="100" />
-  </scroll_list>
-  <panel
-   background_visible="true"
-   bevel_style="none"
-   top_pad="0"
-   follows="left|right|bottom"
-   height="30"
-   label="bottom_panel"
-   layout="topleft"
-   left="0"
-   name="bottom_panel"
-   width="313">
-<!--
-    <menu_button
-     follows="bottom|left"
-     height="18"
-     image_disabled="OptionsMenu_Disabled"
-     image_selected="OptionsMenu_Press"
-     image_unselected="OptionsMenu_Off"
-     layout="topleft"
-     left="10"
-     menu_filename="menu_voice_effect_gear.xml"
-     name="gear_btn"
-     top="5"
-     tool_tip="More options"
-     width="18" />
--->
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="18"
-     image_selected="AddItem_Press"
-     image_unselected="AddItem_Off"
-     image_disabled="AddItem_Disabled"
-     layout="topleft"
-     left="10"
-     name="add_voice_effect_btn"
-     tool_tip="Get more voice effects"
-     top="5"
-     width="18">
-      <button.commit_callback
-       function="VoiceEffect.Add" />
-    </button>
-<!--
-    <button
-     follows="bottom|left"
-     font="SansSerifBigBold"
-     height="10"
-     image_hover_selected="Activate_Checkmark"
-     image_selected="Activate_Checkmark"
-     image_unselected="Activate_Checkmark"
-     layout="topleft"
-     left_pad="5"
-     name="activate_btn"
-     tool_tip="Activate/Deactivate selected voice effect"
-     top="10"
-     width="10">
-      <button.commit_callback
-       function="VoiceEffect.Activate" />
-    </button>
--->
-  </panel>
   <text
    height="40"
    word_wrap="true"
    use_ellipses="true"
    type="string"
-   text_color="LabelSelectedDisabledColor"
-   length="1"
-   follows="left|bottom|right"
+   follows="left|top|right"
    layout="topleft"
-   left="6"
+   left="10"
    name="status_text"
-   top_pad="10"
-   width="300">
+   right="-10"
+   top="25">
     Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
   </text>
   <button
-   follows="left|bottom"
+   follows="left|top"
    height="23"
    label="Record Sample"
    layout="topleft"
-   left="6"
+   left="5"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
@@ -135,7 +49,7 @@
      function="VoiceEffect.Record" />
   </button>
   <button
-   follows="left|bottom"
+   follows="left|top"
    height="23"
    label="Stop"
    layout="topleft"
@@ -146,4 +60,41 @@
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
+  <scroll_list
+   bottom_delta="280"
+   draw_heading="true"
+   follows="all"
+   layout="topleft"
+   left_delta="0"
+   multi_select="false"
+   name="voice_effect_list"
+   right="-5"
+   tool_tip="Record a sample of your voice, then click an effect to preview."
+   top="100">
+    <scroll_list.columns
+     label="Name"
+     name="name"
+     width="120" />
+    <scroll_list.columns
+     label="New"
+     name="new"
+     width="60" />
+    <scroll_list.columns
+     label="Expires"
+     name="expires"
+     width="110" />
+  </scroll_list>
+  <text
+   height="20"
+   word_wrap="true"
+   use_ellipses="true"
+   type="string"
+   follows="left|bottom|right"
+   layout="topleft"
+   left="10"
+   name="voice_morphing_link"
+   right="-10"
+   top_pad="5">
+    [[URL] Get Voice Morphing]
+  </text>
 </floater>
-- 
cgit v1.3


From 563ae1c7e029ceef2aed0b85623c2f0a95d38b46 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 25 May 2010 02:47:28 +0100
Subject: EXT-7337 WIP Replace the new column with a (New!) tag after the voice
 effect name

---
 indra/newview/llfloatervoiceeffect.cpp             | 24 ++++++++++++----------
 .../skins/default/xui/en/floater_voice_effect.xml  | 12 ++++-------
 2 files changed, 17 insertions(+), 19 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 9529f947c1..46356cf161 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -145,6 +145,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		}
 	}
 
+	// Add each Voice Effect template, if there are any (template list includes all usable effects)
 	const voice_effect_list_t& template_list = effect_interface->getVoiceEffectTemplateList();
 	if (!template_list.empty())
 	{
@@ -161,15 +162,21 @@ void LLFloaterVoiceEffect::refreshEffectList()
 				effect_name += " " + getString("active_voice_effect");
 			}
 
+			// Tag available effects that are new this session
+			if (effect_properties["is_new"].asBoolean())
+			{
+				effect_name += " " + getString("new_voice_effect");
+			}
+
 			LLDate expiry_date = effect_properties["expiry_date"].asDate();
 			bool is_template_only = effect_properties["template_only"].asBoolean();
-			bool is_new = effect_properties["is_new"].asBoolean();
 
 			std::string font_style = "NORMAL";
 			if (!is_template_only)
 			{
 				font_style = "BOLD";
 			}
+
 			LLSD element;
 			element["id"] = effect_id;
 
@@ -178,21 +185,16 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			element["columns"][0]["font"]["name"] = "SANSSERIF";
 			element["columns"][0]["font"]["style"] = font_style;
 
-			element["columns"][1]["column"] = "new";
-			element["columns"][1]["value"] = is_new ? getString("new_voice_effect") : "";
-			element["columns"][1]["font"]["name"] = "SANSSERIF";
-			element["columns"][1]["font"]["style"] = font_style;
-
-			element["columns"][2]["column"] = "expires";
+			element["columns"][1]["column"] = "expires";
 			if (!is_template_only)
 			{
-				element["columns"][2]["value"] = expiry_date;
+				element["columns"][1]["value"] = expiry_date;
 			}
 			else {
-				element["columns"][2]["value"] = "";
+				element["columns"][1]["value"] = "";
 			}
-			element["columns"][2]["font"]["name"] = "SANSSERIF";
-			element["columns"][2]["font"]["style"] = font_style;
+			element["columns"][1]["font"]["name"] = "SANSSERIF";
+			element["columns"][1]["font"]["style"] = font_style;
 
 			LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM);
 			// *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :(
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 73e4a694eb..f79d4fd35c 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -20,7 +20,7 @@
     (Active)
   </string>
   <string name="new_voice_effect">
-    New!
+    (New!)
   </string>
   <text
    height="40"
@@ -72,13 +72,9 @@
    tool_tip="Record a sample of your voice, then click an effect to preview."
    top="100">
     <scroll_list.columns
-     label="Name"
-     name="name"
-     width="120" />
-    <scroll_list.columns
-     label="New"
-     name="new"
-     width="60" />
+     dynamic_width="true"
+     label="Voice Effect"
+     name="name"/>
     <scroll_list.columns
      label="Expires"
      name="expires"
-- 
cgit v1.3


From 3e85291fee01680f465198d895d12fef733b146c Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Tue, 25 May 2010 03:36:36 +0100
Subject: EXT-7337 WIP Further tweaking of Voice Effect preview layout

---
 indra/newview/llfloatervoiceeffect.cpp             |  5 ++-
 .../skins/default/xui/en/floater_voice_effect.xml  | 51 +++++++++++-----------
 2 files changed, 29 insertions(+), 27 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 46356cf161..b47d562995 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -189,19 +189,20 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			if (!is_template_only)
 			{
 				element["columns"][1]["value"] = expiry_date;
+				element["columns"][1]["type"] = "date";
 			}
 			else {
 				element["columns"][1]["value"] = "";
 			}
 			element["columns"][1]["font"]["name"] = "SANSSERIF";
-			element["columns"][1]["font"]["style"] = font_style;
+			element["columns"][1]["font"]["style"] = "NORMAL";
 
 			LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM);
 			// *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :(
 			if(sl_item)
 			{
 				LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD;
-				((LLScrollListText*)sl_item->getColumn(0))->setFontStyle(style);
+				dynamic_cast<LLScrollListText*>(sl_item->getColumn(0))->setFontStyle(style);
 			}
 		}
 	}
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index f79d4fd35c..4f4b20066d 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -11,8 +11,8 @@
  label="Places"
  layout="topleft"
  min_height="350"
- min_width="240"
- width="300">
+ min_width="300"
+ width="455">
   <string name="no_voice_effect">
     (No Voice Effect)
   </string>
@@ -33,18 +33,19 @@
    name="status_text"
    right="-10"
    top="25">
-    Record a sample of your voice, and then select an effect to preview. Close this window to return to in-world voice.
+Record a sample of your voice, and then select an effect to preview.
+Close this window to return to in-world voice.
   </text>
   <button
    follows="left|top"
    height="23"
    label="Record Sample"
    layout="topleft"
-   left="5"
+   left="10"
    name="record_btn"
    tool_tip="Record a sample of your voice."
    top_pad="5"
-   width="135">
+   width="150">
     <button.commit_callback
      function="VoiceEffect.Record" />
   </button>
@@ -56,41 +57,41 @@
    left_delta="0"
    name="record_stop_btn"
    top_delta="0"
-   width="135">
+   width="150">
     <button.commit_callback
      function="VoiceEffect.Stop" />
   </button>
+  <text
+   height="18"
+   halign="right"
+   use_ellipses="true"
+   type="string"
+   follows="left|top|right"
+   layout="topleft"
+   left_pad="10"
+   name="voice_morphing_link"
+   right="-10"
+   top_delta="5">
+    [[URL] Get Voice Morphing]
+  </text>
   <scroll_list
-   bottom_delta="280"
+   bottom="-10"
    draw_heading="true"
    follows="all"
    layout="topleft"
-   left_delta="0"
+   left="10"
    multi_select="false"
    name="voice_effect_list"
-   right="-5"
+   right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
    top="100">
     <scroll_list.columns
-     dynamic_width="true"
      label="Voice Effect"
-     name="name"/>
+     name="name" relative_width="0.41"/>
     <scroll_list.columns
+     dynamic_width="true"
      label="Expires"
      name="expires"
-     width="110" />
+	 relative_width="0.59" />
   </scroll_list>
-  <text
-   height="20"
-   word_wrap="true"
-   use_ellipses="true"
-   type="string"
-   follows="left|bottom|right"
-   layout="topleft"
-   left="10"
-   name="voice_morphing_link"
-   right="-10"
-   top_pad="5">
-    [[URL] Get Voice Morphing]
-  </text>
 </floater>
-- 
cgit v1.3


From d821d371e30cb7fcf32b6fae12ef4557e729bca3 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 27 May 2010 11:41:07 +0100
Subject: EXT-7138 WIP Removed now redundant onClickAdd callback from the Voice
 Effect preview floater. Cleaned up comments.

---
 indra/newview/llfloatervoiceeffect.cpp | 8 +-------
 indra/newview/llfloatervoiceeffect.h   | 6 +++---
 indra/newview/llpanelvoiceeffect.cpp   | 2 +-
 indra/newview/llpanelvoiceeffect.h     | 2 +-
 4 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index b47d562995..d27adfcea1 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -1,5 +1,6 @@
 /** 
  * @file llfloatervoiceeffect.cpp
+ * @author Aimee
  * @brief Selection and preview of voice effect.
  *
  * $LicenseInfo:firstyear=2010&license=viewergpl$
@@ -44,7 +45,6 @@ LLFloaterVoiceEffect::LLFloaterVoiceEffect(const LLSD& key)
 	mCommitCallbackRegistrar.add("VoiceEffect.Record",	boost::bind(&LLFloaterVoiceEffect::onClickRecord, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Play",	boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
 	mCommitCallbackRegistrar.add("VoiceEffect.Stop",	boost::bind(&LLFloaterVoiceEffect::onClickStop, this));
-	mCommitCallbackRegistrar.add("VoiceEffect.Add",		boost::bind(&LLFloaterVoiceEffect::onClickAdd, this));
 //	mCommitCallbackRegistrar.add("VoiceEffect.Activate", boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
 }
 
@@ -280,12 +280,6 @@ void LLFloaterVoiceEffect::onClickStop()
 	updateControls();
 }
 
-void LLFloaterVoiceEffect::onClickAdd()
-{
-	// Open the voice morphing info web page
-	LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
-}
-
 //void LLFloaterVoiceEffect::onClickActivate()
 //{
 //	LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index 46b241bd17..2a8330c72a 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -1,5 +1,6 @@
 /** 
  * @file llfloatervoiceeffect.h
+ * @author Aimee
  * @brief Selection and preview of voice effects.
  *
  * $LicenseInfo:firstyear=2010&license=viewergpl$
@@ -62,9 +63,8 @@ private:
 	void onClickRecord();
 	void onClickPlay();
 	void onClickStop();
- 	void onClickAdd();
-// 	void onClickActivate();
-
+//	void onClickActivate();
+	
 	LLUUID mSelectedID;
 	LLScrollListCtrl* mVoiceEffectList;
 };
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
index 518afc5eb3..707e05048e 100644
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ b/indra/newview/llpanelvoiceeffect.cpp
@@ -1,6 +1,6 @@
 /** 
  * @file llpanelvoiceeffect.cpp
- * @author Aimee Walton
+ * @author Aimee
  * @brief Panel to select Voice Effects.
  *
  * $LicenseInfo:firstyear=2010&license=viewergpl$
diff --git a/indra/newview/llpanelvoiceeffect.h b/indra/newview/llpanelvoiceeffect.h
index 235db5a9e4..c773b4ce94 100644
--- a/indra/newview/llpanelvoiceeffect.h
+++ b/indra/newview/llpanelvoiceeffect.h
@@ -1,6 +1,6 @@
 /** 
  * @file llpanelvoiceeffect.h
- * @author Aimee Walton
+ * @author Aimee
  * @brief Panel to select Voice Effects.
  *
  * $LicenseInfo:firstyear=2010&license=viewergpl$
-- 
cgit v1.3


From 485f9abde6b728a923070e392e40c16ea9f05226 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 27 May 2010 12:53:53 +0100
Subject: EXT-7138 WIP Changed UI text to use "Voice Morph" everywhere instead
 of "Voice Effect". Revised wording in preview floater (DEV-50573). Added
 tool-tip for Voice Morphing control in Nearby Voice (DEV-50608).

---
 indra/newview/app_settings/settings.xml                 |  4 ++--
 indra/newview/app_settings/settings_per_account.xml     |  2 +-
 indra/newview/llfloatervoiceeffect.cpp                  |  6 +++---
 indra/newview/llpanelvoiceeffect.cpp                    | 10 +++++-----
 indra/newview/llpanelvoiceeffect.h                      |  2 +-
 .../skins/default/xui/en/floater_voice_effect.xml       | 17 +++++++++--------
 indra/newview/skins/default/xui/en/notifications.xml    | 14 +++++++-------
 .../newview/skins/default/xui/en/panel_voice_effect.xml |  5 +++--
 8 files changed, 31 insertions(+), 29 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 505403b155..4dd121fd22 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -10609,7 +10609,7 @@
     <key>VoiceEffectExpiryWarningTime</key>
     <map>
       <key>Comment</key>
-      <string>How much notice to give of voice effect subscriptions expiry, in seconds.</string>
+      <string>How much notice to give of Voice Morph subscriptions expiry, in seconds.</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
@@ -10620,7 +10620,7 @@
     <key>VoiceMorphingEnabled</key>
     <map>
       <key>Comment</key>
-      <string>Whether or not to enable Voice Effects and show the UI.</string>
+      <string>Whether or not to enable Voice Morphs and show the UI.</string>
       <key>Persist</key>
       <integer>0</integer>
       <key>Type</key>
diff --git a/indra/newview/app_settings/settings_per_account.xml b/indra/newview/app_settings/settings_per_account.xml
index c94ae1fca1..d4000e9253 100644
--- a/indra/newview/app_settings/settings_per_account.xml
+++ b/indra/newview/app_settings/settings_per_account.xml
@@ -102,7 +102,7 @@
     <key>VoiceEffectDefault</key>
     <map>
         <key>Comment</key>
-            <string>Selected voice effect</string>
+            <string>Selected Voice Morph</string>
         <key>Persist</key>
             <integer>1</integer>
         <key>Type</key>
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index d27adfcea1..22392dca8b 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -114,7 +114,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		return;
 	}
 
-	LL_DEBUGS("Voice")<< "Rebuilding voice effect list."<< LL_ENDL;
+	LL_DEBUGS("Voice")<< "Rebuilding Voice Morph list."<< LL_ENDL;
 
 	// Preserve selected items and scroll position
 	S32 scroll_pos = mVoiceEffectList->getScrollPos();
@@ -128,7 +128,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 	mVoiceEffectList->deleteAllItems();
 
 	{
-		// Add the "No Voice Effect" entry
+		// Add the "No Voice Morph" entry
 		LLSD element;
 
 		element["id"] = LLUUID::null;
@@ -145,7 +145,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		}
 	}
 
-	// Add each Voice Effect template, if there are any (template list includes all usable effects)
+	// Add each Voice Morph template, if there are any (template list includes all usable effects)
 	const voice_effect_list_t& template_list = effect_interface->getVoiceEffectTemplateList();
 	if (!template_list.empty())
 	{
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
index 707e05048e..fd470798ee 100644
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ b/indra/newview/llpanelvoiceeffect.cpp
@@ -1,7 +1,7 @@
 /** 
  * @file llpanelvoiceeffect.cpp
  * @author Aimee
- * @brief Panel to select Voice Effects.
+ * @brief Panel to select Voice Morphs.
  *
  * $LicenseInfo:firstyear=2010&license=viewergpl$
  * 
@@ -102,7 +102,7 @@ void LLPanelVoiceEffect::onCommitVoiceEffect()
 	LLSD value = mVoiceEffectCombo->getValue();
 	if (value.asInteger() == PREVIEW_VOICE_EFFECTS)
 	{
-		// Open the voice effects management floater
+		// Open the Voice Morph preview floater
 		LLFloaterReg::showInstance("voice_effect");
 	}
 	else if (value.asInteger() == GET_VOICE_EFFECTS)
@@ -131,12 +131,12 @@ void LLPanelVoiceEffect::update(bool list_updated)
 		LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
 		if (list_updated)
 		{
-			// Add the default "No Voice Effect" entry.
+			// Add the default "No Voice Morph" entry.
 			mVoiceEffectCombo->removeall();
 			mVoiceEffectCombo->add(getString("no_voice_effect"), LLUUID::null);
 			mVoiceEffectCombo->addSeparator();
 
-			// Add entries for each Voice Effect.
+			// Add entries for each Voice Morph.
 			const voice_effect_list_t& effect_list = effect_interface->getVoiceEffectList();
 			if (!effect_list.empty())
 			{
@@ -155,7 +155,7 @@ void LLPanelVoiceEffect::update(bool list_updated)
 
 		if (effect_interface && LLVoiceClient::instance().isVoiceWorking())
 		{
-			// Select the current voice effect.
+			// Select the current Voice Morph.
 			mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());
 			mVoiceEffectCombo->setEnabled(true);
 		}
diff --git a/indra/newview/llpanelvoiceeffect.h b/indra/newview/llpanelvoiceeffect.h
index c773b4ce94..79f9d2fe75 100644
--- a/indra/newview/llpanelvoiceeffect.h
+++ b/indra/newview/llpanelvoiceeffect.h
@@ -58,7 +58,7 @@ private:
 	/// Called by voice effect provider when voice effect list is changed.
 	virtual void onVoiceEffectChanged(bool effect_list_updated);
 
-	// Fixed entries in the voice effect list
+	// Fixed entries in the Voice Morph list
 	typedef enum e_voice_effect_combo_items
 	{
 		NO_VOICE_EFFECT = 0,
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 4f4b20066d..207397d3dc 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  can_resize="true"
- height="400"
+ height="420"
  name="voice_effects"
  help_topic="voice_effects"
  title="PREVIEW VOICE MORPHING"
@@ -11,10 +11,10 @@
  label="Places"
  layout="topleft"
  min_height="350"
- min_width="300"
+ min_width="330"
  width="455">
   <string name="no_voice_effect">
-    (No Voice Effect)
+    (No Voice Morph)
   </string>
   <string name="active_voice_effect">
     (Active)
@@ -23,7 +23,7 @@
     (New!)
   </string>
   <text
-   height="40"
+   height="68"
    word_wrap="true"
    use_ellipses="true"
    type="string"
@@ -33,8 +33,9 @@
    name="status_text"
    right="-10"
    top="25">
-Record a sample of your voice, and then select an effect to preview.
-Close this window to return to in-world voice.
+To preview any of the Voice Morphing effects, click the Record button to record a short snippet of voice, then click any Voice Morph in the list to hear how it will sound.
+
+To reconnect to Nearby Voice simply close this window.
   </text>
   <button
    follows="left|top"
@@ -84,9 +85,9 @@ Close this window to return to in-world voice.
    name="voice_effect_list"
    right="-10"
    tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="100">
+   top="128">
     <scroll_list.columns
-     label="Voice Effect"
+     label="Voice Morph"
      name="name" relative_width="0.41"/>
     <scroll_list.columns
      dynamic_width="true"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b997dee30c..99896e46c9 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5962,8 +5962,8 @@ We are creating a voice channel for you. This may take up to one minute.
    sound="UISndAlert"
    persist="true"
    type="notify">
-Subscribed Voice Effects have expired.
-[[URL] Renew your subscription] to reactivate them.
+One or more of your subscribed Voice Morphs has expired.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5973,8 +5973,8 @@ Subscribed Voice Effects have expired.
    sound="UISndAlert"
    persist="true"
    type="notify">
-The active Voice Effect has expired, your normal voice settings have been applied.
-[[URL] Renew your subscription] to reactivate it.
+The active Voice Morph has expired, your normal voice settings have been applied.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 
@@ -5984,8 +5984,8 @@ The active Voice Effect has expired, your normal voice settings have been applie
    sound="UISndAlert"
    persist="true"
    type="notify">
-Voice Effects will expire in less than [INTERVAL] days.
-[[URL] Renew your subscription] or they will be removed.
+One or more of your Voice Morphs will expire in less than [INTERVAL] days.
+[[URL] Click here] to renew your subscription.
     <unique/>
   </notification>
 		LLNotificationsUtil::add("VoiceEffectsNew");
@@ -5996,7 +5996,7 @@ Voice Effects will expire in less than [INTERVAL] days.
    sound="UISndAlert"
    persist="true"
    type="notify">
-New Voice Effects are available!
+New Voice Morphs are available!
     <unique/>
   </notification>
 
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
index 9b6548ef9c..c575ca468c 100644
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
@@ -6,7 +6,7 @@
  name="panel_voice_effect"
  width="200">
   <string name="no_voice_effect">
-    No Voice Effect
+    No Voice Morph
   </string>
   <string name="preview_voice_effects">
     Preview Voice Morphing  ▶
@@ -19,10 +19,11 @@
    follows="left|top|right"
    height="23"
    name="voice_effect"
+   tool_tip="Select a Voice Morphing effect to change your voice."
    top_pad="0"
    width="200">
     <combo_box.item
-     label="No Voice Effect"
+     label="No Voice Morph"
      name="no_voice_effect"
 	 top_pad="0"
      value="0" />
-- 
cgit v1.3


From 9fa2447c59f6f0ff44b2127576af91f9b864f7aa Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 27 May 2010 13:58:11 +0100
Subject: EXT-7138 WIP Kill the magic column numbers! Remove hardcoded font
 selections.

---
 indra/newview/llfloatervoiceeffect.cpp | 23 ++++++++++-------------
 indra/newview/llfloatervoiceeffect.h   |  6 ++++++
 2 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 22392dca8b..2243f0bf9a 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -132,10 +132,9 @@ void LLFloaterVoiceEffect::refreshEffectList()
 		LLSD element;
 
 		element["id"] = LLUUID::null;
-		element["columns"][0]["column"] = "name";
-		element["columns"][0]["value"] = getString("no_voice_effect");
-		element["columns"][0]["font"]["name"] = "SANSSERIF";
-		element["columns"][0]["font"]["style"] = "ITALIC";
+		element["columns"][NAME_COLUMN]["column"] = "name";
+		element["columns"][NAME_COLUMN]["value"] = getString("no_voice_effect");
+		element["columns"][NAME_COLUMN]["font"]["style"] = "BOLD";
 
 		LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM);
 		// *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :(
@@ -180,22 +179,20 @@ void LLFloaterVoiceEffect::refreshEffectList()
 			LLSD element;
 			element["id"] = effect_id;
 
-			element["columns"][0]["column"] = "name";
-			element["columns"][0]["value"] = effect_name;
-			element["columns"][0]["font"]["name"] = "SANSSERIF";
-			element["columns"][0]["font"]["style"] = font_style;
+			element["columns"][NAME_COLUMN]["column"] = "name";
+			element["columns"][NAME_COLUMN]["value"] = effect_name;
+			element["columns"][NAME_COLUMN]["font"]["style"] = font_style;
 
 			element["columns"][1]["column"] = "expires";
 			if (!is_template_only)
 			{
-				element["columns"][1]["value"] = expiry_date;
-				element["columns"][1]["type"] = "date";
+				element["columns"][DATE_COLUMN]["value"] = expiry_date;
+				element["columns"][DATE_COLUMN]["type"] = "date";
 			}
 			else {
-				element["columns"][1]["value"] = "";
+				element["columns"][DATE_COLUMN]["value"] = "";
 			}
-			element["columns"][1]["font"]["name"] = "SANSSERIF";
-			element["columns"][1]["font"]["style"] = "NORMAL";
+//			element["columns"][DATE_COLUMN]["font"]["style"] = "NORMAL";
 
 			LLScrollListItem* sl_item = mVoiceEffectList->addElement(element, ADD_BOTTOM);
 			// *HACK: Copied from llfloatergesture.cpp : ["font"]["style"] does not affect font style :(
diff --git a/indra/newview/llfloatervoiceeffect.h b/indra/newview/llfloatervoiceeffect.h
index 2a8330c72a..a3429577bb 100644
--- a/indra/newview/llfloatervoiceeffect.h
+++ b/indra/newview/llfloatervoiceeffect.h
@@ -54,6 +54,12 @@ public:
 	virtual void onClose(bool app_quitting);
 
 private:
+	enum ColumnIndex
+	{
+		NAME_COLUMN = 0,
+		DATE_COLUMN = 1,
+	};
+
 	void refreshEffectList();
 	void updateControls();
 
-- 
cgit v1.3


From 6c3c9c249304d03b86bf703d27b510f6bcc16189 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 27 May 2010 16:45:29 +0100
Subject: EXT-7138 WIP Indicate unsubscribed Voice Morphs with (Unsubscribed)
 in the expiry date column.

---
 indra/newview/llfloatervoiceeffect.cpp                      | 2 +-
 indra/newview/skins/default/xui/en/floater_voice_effect.xml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llfloatervoiceeffect.cpp')

diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
index 2243f0bf9a..ca1f142760 100644
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ b/indra/newview/llfloatervoiceeffect.cpp
@@ -190,7 +190,7 @@ void LLFloaterVoiceEffect::refreshEffectList()
 				element["columns"][DATE_COLUMN]["type"] = "date";
 			}
 			else {
-				element["columns"][DATE_COLUMN]["value"] = "";
+				element["columns"][DATE_COLUMN]["value"] = getString("unsubscribed_voice_effect");
 			}
 //			element["columns"][DATE_COLUMN]["font"]["style"] = "NORMAL";
 
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
index 207397d3dc..edc25348e4 100644
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
@@ -19,6 +19,9 @@
   <string name="active_voice_effect">
     (Active)
   </string>
+  <string name="unsubscribed_voice_effect">
+    (Unsubscribed)
+  </string>
   <string name="new_voice_effect">
     (New!)
   </string>
-- 
cgit v1.3