summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-27 11:41:07 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-27 11:41:07 +0100
commitd821d371e30cb7fcf32b6fae12ef4557e729bca3 (patch)
tree60f3a4ceb79041e1d8ac938c991be518859efcfa
parent7ab53a6eec2617357ad6d7e7b2f2a3879a663124 (diff)
EXT-7138 WIP Removed now redundant onClickAdd callback from the Voice Effect preview floater.
Cleaned up comments.
-rw-r--r--indra/newview/llfloatervoiceeffect.cpp8
-rw-r--r--indra/newview/llfloatervoiceeffect.h6
-rw-r--r--indra/newview/llpanelvoiceeffect.cpp2
-rw-r--r--indra/newview/llpanelvoiceeffect.h2
4 files changed, 6 insertions, 12 deletions
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$