summaryrefslogtreecommitdiff
path: root/indra/newview/llfirstuse.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2008-04-03 18:43:54 +0000
committerJames Cook <james@lindenlab.com>2008-04-03 18:43:54 +0000
commit55c25229b79b1755c989e5996c8e8d118f369721 (patch)
tree1fa882bc7e11dc8aec031d5e268131809874168a /indra/newview/llfirstuse.cpp
parentb3fcfa16ba8b984163c38904e165052a34be6dab (diff)
svn merge -r 83778:83944 maint-ui-10-merge
QAR-442
Diffstat (limited to 'indra/newview/llfirstuse.cpp')
-rw-r--r--indra/newview/llfirstuse.cpp15
1 files changed, 0 insertions, 15 deletions
diff --git a/indra/newview/llfirstuse.cpp b/indra/newview/llfirstuse.cpp
index b00450eec6..c07319e224 100644
--- a/indra/newview/llfirstuse.cpp
+++ b/indra/newview/llfirstuse.cpp
@@ -38,7 +38,6 @@
// viewer includes
#include "llnotify.h"
-#include "llfloatervoicewizard.h"
#include "llviewercontrol.h"
#include "llui.h"
#include "llappviewer.h"
@@ -255,20 +254,6 @@ void LLFirstUse::useSculptedPrim()
}
// static
-void LLFirstUse::useVoice()
-{
- if (!gSavedSettings.getBOOL("CmdLineDisableVoice"))
- {
- if (gSavedSettings.getWarning("FirstVoice"))
- {
- gSavedSettings.setWarning("FirstVoice", FALSE);
-
- LLFloaterVoiceWizard::showInstance();
- }
- }
-}
-
-// static
void LLFirstUse::useMedia()
{
if (gSavedSettings.getWarning("FirstMedia"))