#5419 remove old unused floater

71 files changed, 0 insertions, 4246 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 0949a3b59f..05c71f5f5d 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -197,7 +197,6 @@ set(viewer_SOURCE_FILES
     llfloateravatartextures.cpp
     llfloaterbanduration.cpp
     llfloaterbeacons.cpp
-    llfloaterbigpreview.cpp
     llfloaterbuildoptions.cpp
     llfloaterbulkpermission.cpp
     llfloaterbulkupload.cpp
@@ -280,7 +279,6 @@ set(viewer_SOURCE_FILES
     llfloaterpay.cpp
     llfloaterperformance.cpp
     llfloaterperms.cpp
-    llfloaterpostprocess.cpp
     llfloaterprofile.cpp
     llfloaterpreference.cpp
     llfloaterpreferencesgraphicsadvanced.cpp
@@ -305,7 +303,6 @@ set(viewer_SOURCE_FILES
     llfloatersidepanelcontainer.cpp
     llfloaterslapptest.cpp
     llfloatersnapshot.cpp
-    llfloatersounddevices.cpp
     llfloaterspellchecksettings.cpp
     llfloatertelehub.cpp
     llfloatertestinspectors.cpp
@@ -317,7 +314,6 @@ set(viewer_SOURCE_FILES
     llfloatertranslationsettings.cpp
     llfloateruipreview.cpp
     llfloaterurlentry.cpp
-    llfloatervoiceeffect.cpp
     llfloatervoicevolume.cpp
     llfloaterwebcontent.cpp
     llfloaterwhitelistentry.cpp
@@ -513,7 +509,6 @@ set(viewer_SOURCE_FILES
     llpanelsnapshotprofile.cpp
     llpanelteleporthistory.cpp
     llpaneltiptoast.cpp
-    llpanelvoiceeffect.cpp
     llpaneltopinfobar.cpp
     llpanelpulldown.cpp
     llpanelvoicedevicesettings.cpp
@@ -881,7 +876,6 @@ set(viewer_HEADER_FILES
     llfloateravatartextures.h
     llfloaterbanduration.h
     llfloaterbeacons.h
-    llfloaterbigpreview.h
     llfloaterbuildoptions.h
     llfloaterbulkpermission.h
     llfloaterbulkupload.h
@@ -968,7 +962,6 @@ set(viewer_HEADER_FILES
     llfloaterpay.h
     llfloaterperformance.h
     llfloaterperms.h
-    llfloaterpostprocess.h
     llfloaterprofile.h
     llfloaterpreference.h
     llfloaterpreferencesgraphicsadvanced.h
@@ -993,7 +986,6 @@ set(viewer_HEADER_FILES
     llfloatersidepanelcontainer.h
     llfloaterslapptest.h
     llfloatersnapshot.h
-    llfloatersounddevices.h
     llfloaterspellchecksettings.h
     llfloatertelehub.h
     llfloatertestinspectors.h
@@ -1005,7 +997,6 @@ set(viewer_HEADER_FILES
     llfloatertranslationsettings.h
     llfloateruipreview.h
     llfloaterurlentry.h
-    llfloatervoiceeffect.h
     llfloatervoicevolume.h
     llfloaterwebcontent.h
     llfloaterwhitelistentry.h
@@ -1187,7 +1178,6 @@ set(viewer_HEADER_FILES
     llpaneltiptoast.h
     llpanelpulldown.h
     llpanelvoicedevicesettings.h
-    llpanelvoiceeffect.h
     llpaneltopinfobar.h
     llpanelvolume.h
     llpanelvolumepulldown.h
diff --git a/indra/newview/llfloaterbigpreview.cpp b/indra/newview/llfloaterbigpreview.cpp
deleted file mode 100644
index ba682494bb..0000000000
--- a/indra/newview/llfloaterbigpreview.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
-* @file llfloaterbigpreview.cpp
-* @brief Display of extended (big) preview for snapshots and SL Share
-* @author merov@lindenlab.com
-*
-* $LicenseInfo:firstyear=2013&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2013, Linden Research, Inc.
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation;
-* version 2.1 of the License only.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-* $/LicenseInfo$
-*/
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterbigpreview.h"
-#include "llsnapshotlivepreview.h"
-
-///////////////////////
-//LLFloaterBigPreview//
-///////////////////////
-
-LLFloaterBigPreview::LLFloaterBigPreview(const LLSD& key) : LLFloater(key),
-    mPreviewPlaceholder(NULL),
-    mFloaterOwner(NULL)
-{
-}
-
-LLFloaterBigPreview::~LLFloaterBigPreview()
-{
-    if (mPreviewHandle.get())
-    {
-        mPreviewHandle.get()->die();
-    }
-}
-
-void LLFloaterBigPreview::onCancel()
-{
-    closeFloater();
-}
-
-void LLFloaterBigPreview::closeOnFloaterOwnerClosing(LLFloater* floaterp)
-{
-    if (isFloaterOwner(floaterp))
-    {
-        closeFloater();
-    }
-}
-
-bool LLFloaterBigPreview::postBuild()
-{
-    mPreviewPlaceholder = getChild<LLUICtrl>("big_preview_placeholder");
-    return LLFloater::postBuild();
-}
-
-void LLFloaterBigPreview::draw()
-{
-    LLFloater::draw();
-
-    LLSnapshotLivePreview * previewp = static_cast<LLSnapshotLivePreview *>(mPreviewHandle.get());
-
-    // Display the preview if one is available
-    if (previewp && previewp->getBigThumbnailImage())
-    {
-        // Get the preview rect
-        const LLRect& preview_rect = mPreviewPlaceholder->getRect();
-
-        // Get the preview texture size
-        S32 thumbnail_w = previewp->getBigThumbnailWidth();
-        S32 thumbnail_h = previewp->getBigThumbnailHeight();
-
-        // Compute the scaling ratio and the size of the final texture in the rect: we want to prevent anisotropic scaling (distorted in x and y)
-        F32 ratio = llmax((F32)(thumbnail_w)/(F32)(preview_rect.getWidth()), (F32)(thumbnail_h)/(F32)(preview_rect.getHeight()));
-        thumbnail_w = (S32)((F32)(thumbnail_w)/ratio);
-        thumbnail_h = (S32)((F32)(thumbnail_h)/ratio);
-
-        // Compute the preview offset within the preview rect: we want to center that preview in the available rect
-        const S32 local_offset_x = (preview_rect.getWidth()  - thumbnail_w) / 2 ;
-        const S32 local_offset_y = (preview_rect.getHeight() - thumbnail_h) / 2 ;
-
-        // Compute preview offset within the floater rect
-        S32 offset_x = preview_rect.mLeft   + local_offset_x;
-        S32 offset_y = preview_rect.mBottom + local_offset_y;
-
-        gGL.matrixMode(LLRender::MM_MODELVIEW);
-        // Apply floater transparency to the texture unless the floater is focused.
-        F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency();
-        LLColor4 color = LLColor4::white;
-
-        // Draw the preview texture
-        gl_draw_scaled_image(offset_x, offset_y,
-                             thumbnail_w, thumbnail_h,
-                             previewp->getBigThumbnailImage(), color % alpha);
-    }
-}
-
diff --git a/indra/newview/llfloaterbigpreview.h b/indra/newview/llfloaterbigpreview.h
deleted file mode 100644
index 1d5804acf5..0000000000
--- a/indra/newview/llfloaterbigpreview.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
-* @file   llfloaterbigpreview.h
-* @brief  Display of extended (big) preview for snapshots
-* @author merov@lindenlab.com
-*
-* $LicenseInfo:firstyear=2013&license=viewerlgpl$
-* Second Life Viewer Source Code
-* Copyright (C) 2013, Linden Research, Inc.
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU Lesser General Public
-* License as published by the Free Software Foundation;
-* version 2.1 of the License only.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this library; if not, write to the Free Software
-* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-*
-* Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
-* $/LicenseInfo$
-*/
-#ifndef LL_LLFLOATERBIGPREVIEW_H
-#define LL_LLFLOATERBIGPREVIEW_H
-
-#include "llfloater.h"
-
-class LLFloaterBigPreview : public LLFloater
-{
-public:
-    LLFloaterBigPreview(const LLSD& key);
-    ~LLFloaterBigPreview();
-
-    bool postBuild();
-    void draw();
-    void onCancel();
-
-    void setPreview(LLView* previewp) { mPreviewHandle = previewp->getHandle(); }
-    void setFloaterOwner(LLFloater* floaterp) { mFloaterOwner = floaterp; }
-    bool isFloaterOwner(LLFloater* floaterp) const { return (mFloaterOwner == floaterp); }
-    void closeOnFloaterOwnerClosing(LLFloater* floaterp);
-
-private:
-    LLHandle<LLView> mPreviewHandle;
-    LLUICtrl*  mPreviewPlaceholder;
-    LLFloater* mFloaterOwner;
-};
-
-#endif // LL_LLFLOATERBIGPREVIEW_H
-
diff --git a/indra/newview/llfloaterpostprocess.cpp b/indra/newview/llfloaterpostprocess.cpp
deleted file mode 100644
index 616c13cdc7..0000000000
--- a/indra/newview/llfloaterpostprocess.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-/**
- * @file llfloaterpostprocess.cpp
- * @brief LLFloaterPostProcess class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterpostprocess.h"
-
-#include "llsliderctrl.h"
-#include "llcheckboxctrl.h"
-#include "llnotificationsutil.h"
-#include "lluictrlfactory.h"
-#include "llviewerdisplay.h"
-#include "llpostprocess.h"
-#include "llcombobox.h"
-#include "lllineeditor.h"
-#include "llviewerwindow.h"
-
-
-LLFloaterPostProcess::LLFloaterPostProcess(const LLSD& key)
-  : LLFloater(key)
-{
-}
-
-LLFloaterPostProcess::~LLFloaterPostProcess()
-{
-
-
-}
-bool LLFloaterPostProcess::postBuild()
-{
-    /// Color Filter Callbacks
-    childSetCommitCallback("ColorFilterToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_color_filter");
-    //childSetCommitCallback("ColorFilterGamma", &LLFloaterPostProcess::onFloatControlMoved, &(gPostProcess->tweaks.gamma()));
-    childSetCommitCallback("ColorFilterBrightness", &LLFloaterPostProcess::onFloatControlMoved, (char*)"brightness");
-    childSetCommitCallback("ColorFilterSaturation", &LLFloaterPostProcess::onFloatControlMoved, (char*)"saturation");
-    childSetCommitCallback("ColorFilterContrast", &LLFloaterPostProcess::onFloatControlMoved, (char*)"contrast");
-
-    childSetCommitCallback("ColorFilterBaseR", &LLFloaterPostProcess::onColorControlRMoved, (char*)"contrast_base");
-    childSetCommitCallback("ColorFilterBaseG", &LLFloaterPostProcess::onColorControlGMoved, (char*)"contrast_base");
-    childSetCommitCallback("ColorFilterBaseB", &LLFloaterPostProcess::onColorControlBMoved, (char*)"contrast_base");
-    childSetCommitCallback("ColorFilterBaseI", &LLFloaterPostProcess::onColorControlIMoved, (char*)"contrast_base");
-
-    /// Night Vision Callbacks
-    childSetCommitCallback("NightVisionToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_night_vision");
-    childSetCommitCallback("NightVisionBrightMult", &LLFloaterPostProcess::onFloatControlMoved, (char*)"brightness_multiplier");
-    childSetCommitCallback("NightVisionNoiseSize", &LLFloaterPostProcess::onFloatControlMoved, (char*)"noise_size");
-    childSetCommitCallback("NightVisionNoiseStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"noise_strength");
-
-    /// Bloom Callbacks
-    childSetCommitCallback("BloomToggle", &LLFloaterPostProcess::onBoolToggle, (char*)"enable_bloom");
-    childSetCommitCallback("BloomExtract", &LLFloaterPostProcess::onFloatControlMoved, (char*)"extract_low");
-    childSetCommitCallback("BloomSize", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_width");
-    childSetCommitCallback("BloomStrength", &LLFloaterPostProcess::onFloatControlMoved, (char*)"bloom_strength");
-
-    // Effect loading and saving.
-    LLComboBox* comboBox = getChild<LLComboBox>("PPEffectsCombo");
-    getChild<LLComboBox>("PPLoadEffect")->setCommitCallback(boost::bind(&LLFloaterPostProcess::onLoadEffect, this, comboBox));
-    comboBox->setCommitCallback(boost::bind(&LLFloaterPostProcess::onChangeEffectName, this, _1));
-
-    LLLineEditor* editBox = getChild<LLLineEditor>("PPEffectNameEditor");
-    getChild<LLComboBox>("PPSaveEffect")->setCommitCallback(boost::bind(&LLFloaterPostProcess::onSaveEffect, this, editBox));
-
-    syncMenu();
-    return true;
-}
-
-// Bool Toggle
-void LLFloaterPostProcess::onBoolToggle(LLUICtrl* ctrl, void* userData)
-{
-    char const * boolVariableName = (char const *)userData;
-
-    // check the bool
-    LLCheckBoxCtrl* cbCtrl = static_cast<LLCheckBoxCtrl*>(ctrl);
-    gPostProcess->tweaks[boolVariableName] = cbCtrl->getValue();
-}
-
-// Float Moved
-void LLFloaterPostProcess::onFloatControlMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlRMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][0] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlGMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][1] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlBMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][2] = sldrCtrl->getValue();
-}
-
-// Color Moved
-void LLFloaterPostProcess::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
-{
-    char const * floatVariableName = (char const *)userData;
-    LLSliderCtrl* sldrCtrl = static_cast<LLSliderCtrl*>(ctrl);
-    gPostProcess->tweaks[floatVariableName][3] = sldrCtrl->getValue();
-}
-
-void LLFloaterPostProcess::onLoadEffect(LLComboBox* comboBox)
-{
-    LLSD::String effectName(comboBox->getSelectedValue().asString());
-
-    gPostProcess->setSelectedEffect(effectName);
-
-    syncMenu();
-}
-
-void LLFloaterPostProcess::onSaveEffect(LLLineEditor* editBox)
-{
-    std::string effectName(editBox->getValue().asString());
-
-    if (gPostProcess->mAllEffects.has(effectName))
-    {
-        LLSD payload;
-        payload["effect_name"] = effectName;
-        LLNotificationsUtil::add("PPSaveEffectAlert", LLSD(), payload, boost::bind(&LLFloaterPostProcess::saveAlertCallback, this, _1, _2));
-    }
-    else
-    {
-        gPostProcess->saveEffect(effectName);
-        syncMenu();
-    }
-}
-
-void LLFloaterPostProcess::onChangeEffectName(LLUICtrl* ctrl)
-{
-    // get the combo box and name
-    LLLineEditor* editBox = getChild<LLLineEditor>("PPEffectNameEditor");
-
-    // set the parameter's new name
-    editBox->setValue(ctrl->getValue());
-}
-
-bool LLFloaterPostProcess::saveAlertCallback(const LLSD& notification, const LLSD& response)
-{
-    S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-
-    // if they choose save, do it.  Otherwise, don't do anything
-    if (option == 0)
-    {
-        gPostProcess->saveEffect(notification["payload"]["effect_name"].asString());
-
-        syncMenu();
-    }
-    return false;
-}
-
-void LLFloaterPostProcess::syncMenu()
-{
-    // add the combo boxe contents
-    LLComboBox* comboBox = getChild<LLComboBox>("PPEffectsCombo");
-
-    comboBox->removeall();
-
-    LLSD::map_const_iterator currEffect;
-    for(currEffect = gPostProcess->mAllEffects.beginMap();
-        currEffect != gPostProcess->mAllEffects.endMap();
-        ++currEffect)
-    {
-        comboBox->add(currEffect->first);
-    }
-
-    // set the current effect as selected.
-    comboBox->selectByValue(gPostProcess->getSelectedEffect());
-
-    /// Sync Color Filter Menu
-    getChild<LLUICtrl>("ColorFilterToggle")->setValue(gPostProcess->tweaks.useColorFilter());
-    //getChild<LLUICtrl>("ColorFilterGamma")->setValue(gPostProcess->tweaks.gamma());
-    getChild<LLUICtrl>("ColorFilterBrightness")->setValue(gPostProcess->tweaks.brightness());
-    getChild<LLUICtrl>("ColorFilterSaturation")->setValue(gPostProcess->tweaks.saturation());
-    getChild<LLUICtrl>("ColorFilterContrast")->setValue(gPostProcess->tweaks.contrast());
-    getChild<LLUICtrl>("ColorFilterBaseR")->setValue(gPostProcess->tweaks.contrastBaseR());
-    getChild<LLUICtrl>("ColorFilterBaseG")->setValue(gPostProcess->tweaks.contrastBaseG());
-    getChild<LLUICtrl>("ColorFilterBaseB")->setValue(gPostProcess->tweaks.contrastBaseB());
-    getChild<LLUICtrl>("ColorFilterBaseI")->setValue(gPostProcess->tweaks.contrastBaseIntensity());
-
-    /// Sync Night Vision Menu
-    getChild<LLUICtrl>("NightVisionToggle")->setValue(gPostProcess->tweaks.useNightVisionShader());
-    getChild<LLUICtrl>("NightVisionBrightMult")->setValue(gPostProcess->tweaks.brightMult());
-    getChild<LLUICtrl>("NightVisionNoiseSize")->setValue(gPostProcess->tweaks.noiseSize());
-    getChild<LLUICtrl>("NightVisionNoiseStrength")->setValue(gPostProcess->tweaks.noiseStrength());
-
-    /// Sync Bloom Menu
-    getChild<LLUICtrl>("BloomToggle")->setValue(LLSD(gPostProcess->tweaks.useBloomShader()));
-    getChild<LLUICtrl>("BloomExtract")->setValue(gPostProcess->tweaks.extractLow());
-    getChild<LLUICtrl>("BloomSize")->setValue(gPostProcess->tweaks.bloomWidth());
-    getChild<LLUICtrl>("BloomStrength")->setValue(gPostProcess->tweaks.bloomStrength());
-}
diff --git a/indra/newview/llfloaterpostprocess.h b/indra/newview/llfloaterpostprocess.h
deleted file mode 100644
index 50b48d8410..0000000000
--- a/indra/newview/llfloaterpostprocess.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file llfloaterpostprocess.h
- * @brief LLFloaterPostProcess class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERPOSTPROCESS_H
-#define LL_LLFLOATERPOSTPROCESS_H
-
-#include "llfloater.h"
-
-class LLButton;
-class LLComboBox;
-class LLLineEditor;
-class LLSliderCtrl;
-class LLTabContainer;
-class LLPanelPermissions;
-class LLPanelObject;
-class LLPanelVolume;
-class LLPanelContents;
-class LLPanelFace;
-
-/**
- * Menu for adjusting the post process settings of the world
- */
-class LLFloaterPostProcess : public LLFloater
-{
-public:
-
-    LLFloaterPostProcess(const LLSD& key);
-    virtual ~LLFloaterPostProcess();
-    bool postBuild();
-
-    /// post process callbacks
-    static void onBoolToggle(LLUICtrl* ctrl, void* userData);
-    static void onFloatControlMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlRMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlGMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlBMoved(LLUICtrl* ctrl, void* userData);
-    static void onColorControlIMoved(LLUICtrl* ctrl, void* userData);
-    void onLoadEffect(LLComboBox* comboBox);
-    void onSaveEffect(LLLineEditor* editBox);
-    void onChangeEffectName(LLUICtrl* ctrl);
-
-    /// prompts a user when overwriting an effect
-    bool saveAlertCallback(const LLSD& notification, const LLSD& response);
-
-    /// sync up sliders
-    void syncMenu();
-};
-
-#endif
diff --git a/indra/newview/llfloatersounddevices.cpp b/indra/newview/llfloatersounddevices.cpp
deleted file mode 100644
index f11c5c0ad8..0000000000
--- a/indra/newview/llfloatersounddevices.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * @file llfloatersounddevices.cpp
- * @author Leyla Farazha
- * @brief Sound Preferences used for minimal skin
- *
-* $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloatersounddevices.h"
-
-#include "lldraghandle.h"
-
-#include "llpanelvoicedevicesettings.h"
-
-// Library includes
-#include "indra_constants.h"
-
-// protected
-LLFloaterSoundDevices::LLFloaterSoundDevices(const LLSD& key)
-:   LLTransientDockableFloater(NULL, false, key)
-{
-    LLTransientFloaterMgr::getInstance()->addControlView(this);
-
-    // force docked state since this floater doesn't save it between recreations
-    setDocked(true);
-}
-
-LLFloaterSoundDevices::~LLFloaterSoundDevices()
-{
-    LLTransientFloaterMgr::getInstance()->removeControlView(this);
-}
-
-// virtual
-bool LLFloaterSoundDevices::postBuild()
-{
-    LLTransientDockableFloater::postBuild();
-
-    updateTransparency(TT_ACTIVE); // force using active floater transparency (STORM-730)
-
-    LLPanelVoiceDeviceSettings* panel = findChild<LLPanelVoiceDeviceSettings>("device_settings_panel");
-    if (panel)
-    {
-        panel->setUseTuningMode(false);
-        getChild<LLUICtrl>("voice_input_device")->setCommitCallback(boost::bind(&LLPanelVoiceDeviceSettings::apply, panel));
-        getChild<LLUICtrl>("voice_output_device")->setCommitCallback(boost::bind(&LLPanelVoiceDeviceSettings::apply, panel));
-        getChild<LLUICtrl>("mic_volume_slider")->setCommitCallback(boost::bind(&LLPanelVoiceDeviceSettings::apply, panel));
-    }
-    return true;
-}
-
-//virtual
-void LLFloaterSoundDevices::setDocked(bool docked, bool pop_on_undock/* = true*/)
-{
-    LLTransientDockableFloater::setDocked(docked, pop_on_undock);
-}
-
-// virtual
-void LLFloaterSoundDevices::setFocus(bool b)
-{
-    LLTransientDockableFloater::setFocus(b);
-
-    // Force using active floater transparency
-    // We have to override setFocus() for because selecting an item of the
-    // combobox causes the floater to lose focus and thus become transparent.
-    updateTransparency(TT_ACTIVE);
-}
diff --git a/indra/newview/llfloatersounddevices.h b/indra/newview/llfloatersounddevices.h
deleted file mode 100644
index 9b21b62747..0000000000
--- a/indra/newview/llfloatersounddevices.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * @file llfloatersounddevices.h
- * @author Leyla Farazha
- * @brief Sound Preferences used for minimal skin
- *
-* $LicenseInfo:firstyear=2011&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERSOUNDDEVICES_H
-#define LL_LLFLOATERSOUNDDEVICES_H
-
-#include "lltransientdockablefloater.h"
-
-class LLFloaterSoundDevices : public LLTransientDockableFloater
-{
-public:
-
-    LOG_CLASS(LLFloaterSoundDevices);
-
-    LLFloaterSoundDevices(const LLSD& key);
-    ~LLFloaterSoundDevices();
-
-    bool postBuild() override;
-    void setDocked(bool docked, bool pop_on_undock = true) override;
-    void setFocus(bool b) override;
-};
-
-
-#endif //LL_LLFLOATERSOUNDDEVICES_H
-
diff --git a/indra/newview/llfloatervoiceeffect.cpp b/indra/newview/llfloatervoiceeffect.cpp
deleted file mode 100644
index 9f7c9aba87..0000000000
--- a/indra/newview/llfloatervoiceeffect.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-/**
- * @file llfloatervoiceeffect.cpp
- * @author Aimee
- * @brief Selection and preview of voice effect.
- *
- * $LicenseInfo:firstyear=2010&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloatervoiceeffect.h"
-
-#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.Stop",    boost::bind(&LLFloaterVoiceEffect::onClickStop, this));
-//  mCommitCallbackRegistrar.add("VoiceEffect.Activate", boost::bind(&LLFloaterVoiceEffect::onClickActivate, 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");
-    getChild<LLButton>("record_btn")->setFocus(true);
-    getChild<LLUICtrl>("voice_morphing_link")->setTextArg("[URL]", LLTrans::getString("voice_morphing_url"));
-
-    mVoiceEffectList = getChild<LLScrollListCtrl>("voice_effect_list");
-    if (mVoiceEffectList)
-    {
-        mVoiceEffectList->setCommitCallback(boost::bind(&LLFloaterVoiceEffect::onClickPlay, this));
-//      mVoiceEffectList->setDoubleClickCallback(boost::bind(&LLFloaterVoiceEffect::onClickActivate, this));
-    }
-
-    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-    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);
-    }
-
-    refreshEffectList();
-    updateControls();
-
-    return true;
-}
-
-// virtual
-void LLFloaterVoiceEffect::onClose(bool app_quitting)
-{
-    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-    if (effect_interface)
-    {
-        effect_interface->enablePreviewBuffer(false);
-    }
-}
-
-void LLFloaterVoiceEffect::refreshEffectList()
-{
-    if (!mVoiceEffectList)
-    {
-        return;
-    }
-
-    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-    if (!effect_interface)
-    {
-        mVoiceEffectList->setEnabled(false);
-        return;
-    }
-
-    LL_DEBUGS("Voice")<< "Rebuilding Voice Morph 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();
-
-    {
-        // Add the "No Voice Morph" entry
-        LLSD element;
-
-        element["id"] = LLUUID::null;
-        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 :(
-        if(sl_item)
-        {
-            ((LLScrollListText*)sl_item->getColumn(0))->setFontStyle(LLFontGL::BOLD);
-        }
-    }
-
-    // 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())
-    {
-        for (voice_effect_list_t::const_iterator it = template_list.begin(); it != template_list.end(); ++it)
-        {
-            const LLUUID& effect_id = it->second;
-
-            std::string localized_effect = "effect_" + it->first;
-            std::string effect_name = hasString(localized_effect) ? getString(localized_effect) : it->first;  // XML contains localized effects names
-
-            LLSD effect_properties = effect_interface->getVoiceEffectProperties(effect_id);
-
-            // Tag the active effect.
-            if (effect_id == LLVoiceClient::instance().getVoiceEffectDefault())
-            {
-                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();
-
-            std::string font_style = "NORMAL";
-            if (!is_template_only)
-            {
-                font_style = "BOLD";
-            }
-
-            LLSD element;
-            element["id"] = effect_id;
-
-            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"][DATE_COLUMN]["value"] = expiry_date;
-                element["columns"][DATE_COLUMN]["type"] = "date";
-            }
-            else {
-                element["columns"][DATE_COLUMN]["value"] = getString("unsubscribed_voice_effect");
-            }
-//          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 :(
-            if(sl_item)
-            {
-                LLFontGL::StyleFlags style = is_template_only ? LLFontGL::NORMAL : LLFontGL::BOLD;
-                LLScrollListText* slt = dynamic_cast<LLScrollListText*>(sl_item->getColumn(0));
-                llassert(slt);
-                if (slt)
-                {
-                    slt->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->setEnabled(true);
-}
-
-void LLFloaterVoiceEffect::updateControls()
-{
-    bool recording = false;
-
-    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-    if (effect_interface)
-    {
-        recording = effect_interface->isPreviewRecording();
-    }
-
-    getChild<LLButton>("record_btn")->setVisible(!recording);
-    getChild<LLButton>("record_stop_btn")->setVisible(recording);
-}
-
-// virtual
-void LLFloaterVoiceEffect::onVoiceEffectChanged(bool effect_list_updated)
-{
-    if (effect_list_updated)
-    {
-        refreshEffectList();
-    }
-    updateControls();
-}
-
-void LLFloaterVoiceEffect::onClickRecord()
-{
-    LL_DEBUGS("Voice") << "Record clicked" << LL_ENDL;
-    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-    if (effect_interface)
-    {
-        effect_interface->recordPreviewBuffer();
-    }
-    updateControls();
-}
-
-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)
-    {
-        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::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
deleted file mode 100644
index 323beb64ae..0000000000
--- a/indra/newview/llfloatervoiceeffect.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * @file llfloatervoiceeffect.h
- * @author Aimee
- * @brief Selection and preview of voice effects.
- *
- * $LicenseInfo:firstyear=2010&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLFLOATERVOICEEFFECT_H
-#define LL_LLFLOATERVOICEEFFECT_H
-
-#include "llfloater.h"
-#include "llvoiceclient.h"
-
-class LLButton;
-class LLScrollListCtrl;
-
-class LLFloaterVoiceEffect
-    : public LLFloater
-    , public LLVoiceEffectObserver
-{
-public:
-    LOG_CLASS(LLFloaterVoiceEffect);
-
-    LLFloaterVoiceEffect(const LLSD& key);
-    virtual ~LLFloaterVoiceEffect();
-
-    bool postBuild() override;
-    void onClose(bool app_quitting) override;
-
-private:
-    enum ColumnIndex
-    {
-        NAME_COLUMN = 0,
-        DATE_COLUMN = 1,
-    };
-
-    void refreshEffectList();
-    void updateControls();
-
-    /// Called by voice effect provider when voice effect list is changed.
-    virtual void onVoiceEffectChanged(bool effect_list_updated) override;
-
-    void onClickRecord();
-    void onClickPlay();
-    void onClickStop();
-//  void onClickActivate();
-
-    LLUUID mSelectedID;
-    LLScrollListCtrl* mVoiceEffectList;
-};
-
-#endif
diff --git a/indra/newview/llpanelvoiceeffect.cpp b/indra/newview/llpanelvoiceeffect.cpp
deleted file mode 100644
index a0129b2cb1..0000000000
--- a/indra/newview/llpanelvoiceeffect.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * @file llpanelvoiceeffect.cpp
- * @author Aimee
- * @brief Panel to select Voice Morphs.
- *
- * $LicenseInfo:firstyear=2010&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llpanelvoiceeffect.h"
-
-#include "llcombobox.h"
-#include "llfloaterreg.h"
-#include "llpanel.h"
-#include "lltrans.h"
-#include "lltransientfloatermgr.h"
-#include "llvoiceclient.h"
-#include "llweb.h"
-
-static LLPanelInjector<LLPanelVoiceEffect> t_panel_voice_effect("panel_voice_effect");
-
-LLPanelVoiceEffect::LLPanelVoiceEffect()
-    : mVoiceEffectCombo(NULL)
-{
-    mCommitCallbackRegistrar.add("Voice.CommitVoiceEffect", boost::bind(&LLPanelVoiceEffect::onCommitVoiceEffect, this));
-}
-
-LLPanelVoiceEffect::~LLPanelVoiceEffect()
-{
-    LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");
-    LLTransientFloaterMgr::getInstance()->removeControlView(combo_list_view);
-
-    if(LLVoiceClient::instanceExists())
-    {
-        LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-        if (effect_interface)
-        {
-            effect_interface->removeObserver(this);
-        }
-    }
-}
-
-// virtual
-bool LLPanelVoiceEffect::postBuild()
-{
-    mVoiceEffectCombo = getChild<LLComboBox>("voice_effect");
-
-    // Need to tell LLTransientFloaterMgr about the combo list, otherwise it can't
-    // be clicked while in a docked floater as it extends outside the floater area.
-    LLView* combo_list_view = mVoiceEffectCombo->getChildView("ComboBox");
-    LLTransientFloaterMgr::getInstance()->addControlView(combo_list_view);
-
-    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-    if (effect_interface)
-    {
-        effect_interface->addObserver(this);
-    }
-
-    update(true);
-
-    return true;
-}
-
-//////////////////////////////////////////////////////////////////////////
-/// PRIVATE SECTION
-//////////////////////////////////////////////////////////////////////////
-
-void LLPanelVoiceEffect::onCommitVoiceEffect()
-{
-    LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-    if (!effect_interface)
-    {
-        mVoiceEffectCombo->setEnabled(false);
-        return;
-    }
-
-    LLSD value = mVoiceEffectCombo->getValue();
-    if (value.asInteger() == PREVIEW_VOICE_EFFECTS)
-    {
-        // Open the Voice Morph preview floater
-        LLFloaterReg::showInstance("voice_effect");
-    }
-    else if (value.asInteger() == GET_VOICE_EFFECTS)
-    {
-        // Open the voice morphing info web page
-        LLWeb::loadURL(LLTrans::getString("voice_morphing_url"));
-    }
-    else
-    {
-        effect_interface->setVoiceEffect(value.asUUID());
-    }
-
-    mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());
-}
-
-// virtual
-void LLPanelVoiceEffect::onVoiceEffectChanged(bool effect_list_updated)
-{
-    update(effect_list_updated);
-}
-
-void LLPanelVoiceEffect::update(bool list_updated)
-{
-    if (mVoiceEffectCombo)
-    {
-        LLVoiceEffectInterface* effect_interface = LLVoiceClient::instance().getVoiceEffectInterface();
-        if (!effect_interface) return;
-        if (list_updated)
-        {
-            // Add the default "No Voice Morph" entry.
-            mVoiceEffectCombo->removeall();
-            mVoiceEffectCombo->add(getString("no_voice_effect"), LLUUID::null);
-            mVoiceEffectCombo->addSeparator();
-
-            // Add entries for each Voice Morph.
-            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)
-                {
-                    mVoiceEffectCombo->add(it->first, it->second, ADD_BOTTOM);
-                }
-
-                mVoiceEffectCombo->addSeparator();
-            }
-
-            // Add the fixed entries to go to the preview floater or marketing page.
-            mVoiceEffectCombo->add(getString("preview_voice_effects"), PREVIEW_VOICE_EFFECTS);
-            mVoiceEffectCombo->add(getString("get_voice_effects"), GET_VOICE_EFFECTS);
-        }
-
-        if (effect_interface && LLVoiceClient::instance().isVoiceWorking())
-        {
-            // Select the current Voice Morph.
-            mVoiceEffectCombo->setValue(effect_interface->getVoiceEffect());
-            mVoiceEffectCombo->setEnabled(true);
-        }
-        else
-        {
-            // If voice isn't working or Voice Effects are not supported disable the control.
-            mVoiceEffectCombo->setValue(LLUUID::null);
-            mVoiceEffectCombo->setEnabled(false);
-        }
-    }
-}
diff --git a/indra/newview/llpanelvoiceeffect.h b/indra/newview/llpanelvoiceeffect.h
deleted file mode 100644
index f920e41081..0000000000
--- a/indra/newview/llpanelvoiceeffect.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * @file llpanelvoiceeffect.h
- * @author Aimee
- * @brief Panel to select Voice Effects.
- *
- * $LicenseInfo:firstyear=2010&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2010, Linden Research, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
- * version 2.1 of the License only.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
- * $/LicenseInfo$
- */
-
-#ifndef LL_PANELVOICEEFFECT_H
-#define LL_PANELVOICEEFFECT_H
-
-#include "llpanel.h"
-#include "llvoiceclient.h"
-
-class LLComboBox;
-
-class LLPanelVoiceEffect
-    : public LLPanel
-    , public LLVoiceEffectObserver
-{
-public:
-    LOG_CLASS(LLPanelVoiceEffect);
-
-    LLPanelVoiceEffect();
-    virtual ~LLPanelVoiceEffect();
-
-    bool postBuild() override;
-
-private:
-    void onCommitVoiceEffect();
-    void update(bool list_updated);
-
-    /// Called by voice effect provider when voice effect list is changed.
-    void onVoiceEffectChanged(bool effect_list_updated) override;
-
-    // Fixed entries in the Voice Morph list
-    typedef enum e_voice_effect_combo_items
-    {
-        NO_VOICE_EFFECT = 0,
-        PREVIEW_VOICE_EFFECTS = 1,
-        GET_VOICE_EFFECTS = 2
-    } EVoiceEffectComboItems;
-
-    LLComboBox* mVoiceEffectCombo;
-};
-
-
-#endif //LL_PANELVOICEEFFECT_H
diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp
index ab5235c3ad..82fc4c6d87 100644
--- a/indra/newview/llviewerfloaterreg.cpp
+++ b/indra/newview/llviewerfloaterreg.cpp
@@ -44,7 +44,6 @@
 #include "llfloateravatarrendersettings.h"
 #include "llfloateravatartextures.h"
 #include "llfloaterbanduration.h"
-#include "llfloaterbigpreview.h"
 #include "llfloaterbeacons.h"
 #include "llfloaterbuildoptions.h"
 #include "llfloaterbulkpermission.h"
@@ -120,7 +119,6 @@
 #include "llfloaterpay.h"
 #include "llfloaterperformance.h"
 #include "llfloaterperms.h"
-#include "llfloaterpostprocess.h"
 #include "llfloaterpreference.h"
 #include "llfloaterpreferencesgraphicsadvanced.h"
 #include "llfloaterpreferenceviewadvanced.h"
@@ -143,7 +141,6 @@
 #include "llfloatersidepanelcontainer.h"
 #include "llfloaterslapptest.h"
 #include "llfloatersnapshot.h"
-#include "llfloatersounddevices.h"
 #include "llfloaterspellchecksettings.h"
 #include "llfloatertelehub.h"
 #include "llfloatertestinspectors.h"
@@ -154,7 +151,6 @@
 #include "llfloatertoybox.h"
 #include "llfloatertranslationsettings.h"
 #include "llfloateruipreview.h"
-#include "llfloatervoiceeffect.h"
 #include "llfloaterwebcontent.h"
 #include "llfloatervoicevolume.h"
 #include "llfloaterwhitelistentry.h"
@@ -370,7 +366,6 @@ void LLViewerFloaterReg::registerFloaters()
 
     LLFloaterReg::add("emoji_picker", "floater_emoji_picker.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiPicker>);
     LLFloaterReg::add("emoji_complete", "floater_emoji_complete.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterEmojiComplete>);
-    LLFloaterReg::add("env_post_process", "floater_post_process.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterPostProcess>);
 
     LLFloaterReg::add("env_fixed_environmentent_water", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentWater>);
     LLFloaterReg::add("env_fixed_environmentent_sky", "floater_fixedenvironment.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterFixedEnvironmentSky>);
@@ -499,7 +494,6 @@ void LLViewerFloaterReg::registerFloaters()
     LLFloaterReg::add("sell_land", "floater_sell_land.xml", &LLFloaterSellLand::buildFloater);
     LLFloaterReg::add("settings_color", "floater_settings_color.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSettingsColor>);
     LLFloaterReg::add("settings_debug", "floater_settings_debug.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSettingsDebug>);
-    LLFloaterReg::add("sound_devices", "floater_sound_devices.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSoundDevices>);
     LLFloaterReg::add("stats", "floater_stats.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloater>);
     LLFloaterReg::add("start_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterRunQueue>);
     LLFloaterReg::add("scene_load_stats", "floater_scene_load_stats.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSceneLoadStats>);
@@ -512,8 +506,6 @@ void LLViewerFloaterReg::registerFloaters()
     LLFloaterReg::add("guidebook", "floater_how_to.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterHowTo>);
     LLFloaterReg::add("slapp_test", "floater_test_slapp.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSLappTest>);
 
-    LLFloaterReg::add("big_preview", "floater_big_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBigPreview>);
-
     LLFloaterUIPreviewUtil::registerFloater();
     LLFloaterReg::add("upload_anim_bvh", "floater_animation_bvh_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterBvhPreview>, "upload");
     LLFloaterReg::add("upload_anim_anim", "floater_animation_anim_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterAnimPreview>, "upload");
@@ -522,8 +514,6 @@ void LLViewerFloaterReg::registerFloaters()
     LLFloaterReg::add("upload_script", "floater_script_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptPreview>, "upload");
     LLFloaterReg::add("upload_sound", "floater_sound_preview.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSoundPreview>, "upload");
 
-    LLFloaterReg::add("voice_effect", "floater_voice_effect.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterVoiceEffect>);
-
     LLFloaterReg::add("web_content", "floater_web_content.xml", (LLFloaterBuildFunc)&LLFloaterWebContent::create);
     LLFloaterReg::add("whitelist_entry", "floater_whitelist_entry.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterWhiteListEntry>);
     LLFloaterReg::add("window_size", "floater_window_size.xml", &LLFloaterReg::build<LLFloaterWindowSize>);
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 597292fac5..d1adf460c9 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -9623,17 +9623,6 @@ class LLWorldEnableEnvPreset : public view_listener_t
     }
 };
 
-
-/// Post-Process callbacks
-class LLWorldPostProcess : public view_listener_t
-{
-    bool handleEvent(const LLSD& userdata)
-    {
-        LLFloaterReg::showInstance("env_post_process");
-        return true;
-    }
-};
-
 class LLWorldCheckBanLines : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
@@ -9927,7 +9916,6 @@ void initialize_menus()
     view_listener_t::addMenu(new LLWorldEnableEnvSettings(), "World.EnableEnvSettings");
     view_listener_t::addMenu(new LLWorldEnvPreset(), "World.EnvPreset");
     view_listener_t::addMenu(new LLWorldEnableEnvPreset(), "World.EnableEnvPreset");
-    view_listener_t::addMenu(new LLWorldPostProcess(), "World.PostProcess");
     view_listener_t::addMenu(new LLWorldCheckBanLines() , "World.CheckBanLines");
     view_listener_t::addMenu(new LLWorldShowBanLines() , "World.ShowBanLines");
 
diff --git a/indra/newview/skins/default/xui/da/floater_sound_devices.xml b/indra/newview/skins/default/xui/da/floater_sound_devices.xml
deleted file mode 100644
index cb4cbba570..0000000000
--- a/indra/newview/skins/default/xui/da/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="Lyd enheder">
-	<text name="voice_label">
-		Stemme chat
-	</text>
-	<check_box label="Aktiveret" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/floater_voice_effect.xml b/indra/newview/skins/default/xui/da/floater_voice_effect.xml
deleted file mode 100644
index 86ad251103..0000000000
--- a/indra/newview/skins/default/xui/da/floater_voice_effect.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Steder" name="voice_effects" title="STEMME MORPH">
-	<string name="no_voice_effect">
-		(Ingen stemme &quot;morph&quot;)
-	</string>
-	<string name="active_voice_effect">
-		(Aktiv)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Ikke aktiveret)
-	</string>
-	<string name="new_voice_effect">
-		(Ny!)
-	</string>
-	<text name="preview_text">
-		For at se
-	</text>
-	<text name="status_text">
-		Optag en prøve, klik derefter på en stemme for at høre hvordan det vil lyde.
-	</text>
-	<button label="Optag" name="record_btn" tool_tip="Optag en stemmeprøve."/>
-	<button label="Stop" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] Abonnér nu]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Optag en prøve med din stemme og klik på en effekt for at teste.">
-		<scroll_list.columns label="Stemme navn" name="name"/>
-		<scroll_list.columns label="Udløber" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/da/panel_voice_effect.xml b/indra/newview/skins/default/xui/da/panel_voice_effect.xml
deleted file mode 100644
index 50f561ec7f..0000000000
--- a/indra/newview/skins/default/xui/da/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Voice Morphing Off
-	</string>
-	<string name="preview_voice_effects">
-		Se stemme &quot;morph&quot;  ▶
-	</string>
-	<string name="get_voice_effects">
-		Hente stemme &quot;morph&quot;  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Vælg en stemme &quot;morph&quot; for at ændre din stemme">
-		<combo_box.item label="Stemme morph slukket" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/de/floater_big_preview.xml b/indra/newview/skins/default/xui/de/floater_big_preview.xml
deleted file mode 100644
index c5ce56d1d9..0000000000
--- a/indra/newview/skins/default/xui/de/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="VORSCHAU"/>
diff --git a/indra/newview/skins/default/xui/de/floater_post_process.xml b/indra/newview/skins/default/xui/de/floater_post_process.xml
deleted file mode 100644
index a6ed8cc3df..0000000000
--- a/indra/newview/skins/default/xui/de/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Post-Process Floater" title="POST-PROCESSING-EINSTELLUNGEN">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Farbfilter" name="wmiColorFilterPanel">
-			<check_box label="Ein" name="wmiColorFilterToggle" />
-			<text name="wmiColorFilterBrightnessText">
-				Helligkeit
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Sättigung
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Kontrast
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Kontrast-Grundfarbe
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR" />
-			<slider label="G" name="wmiColorFilterBaseG" />
-			<slider label="B" name="wmiColorFilterBaseB" />
-			<slider label="I" name="wmiColorFilterBaseI" />
-		</panel>
-		<panel label="Nachtsicht" name="wmiNightVisionPanel">
-			<check_box label="Ein" name="wmiNightVisionToggle" />
-			<text name="wmiNightVisionBrightMultText">
-				Lichtverstärkungsmultiplikator
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Rauschen-Größe
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Rauschen-Stärke
-			</text>
-		</panel>
-		<panel label="Bloom" name="wmiBloomPanel">
-			<check_box label="Ein" name="wmiBloomToggle" />
-			<text name="wmiBloomExtractText">
-				Luminanz-Extraktion
-			</text>
-			<text name="wmiBloomSizeText">
-				Bloom-Größe
-			</text>
-			<text name="wmiBloomStrengthText">
-				Bloom-Stärke
-			</text>
-		</panel>
-		<panel label="Extras" name="Extras">
-			<button label="Effekt laden" label_selected="Effekt laden" name="PPLoadEffect" />
-			<button label="Effekt speichern" label_selected="Effekt speichern" name="PPSaveEffect" />
-			<line_editor label="Effektname" name="PPEffectNameEditor" />
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_sound_devices.xml b/indra/newview/skins/default/xui/de/floater_sound_devices.xml
deleted file mode 100644
index 22ccb2c1a2..0000000000
--- a/indra/newview/skins/default/xui/de/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="SOUNDGERÄTE">
-	<text name="voice_label">
-		Voice-Chat
-	</text>
-	<check_box label="Aktiviert" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/floater_voice_effect.xml b/indra/newview/skins/default/xui/de/floater_voice_effect.xml
deleted file mode 100644
index 8d37950480..0000000000
--- a/indra/newview/skins/default/xui/de/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Orte" name="voice_effects" title="VOICE-MORPHING-VORSCHAU">
-	<string name="no_voice_effect">
-		(Kein Voice-Morphing)
-	</string>
-	<string name="active_voice_effect">
-		(Aktiv)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(nicht abonniert)
-	</string>
-	<string name="new_voice_effect">
-		(Neu!)
-	</string>
-	<string name="effect_Arena">
-		Arena
-	</string>
-	<string name="effect_Beast">
-		Bestie
-	</string>
-	<string name="effect_Buff">
-		Muskulös
-	</string>
-	<string name="effect_Buzz">
-		Buzz
-	</string>
-	<string name="effect_Camille">
-		Camille
-	</string>
-	<string name="effect_Creepy">
-		Unheimlich
-	</string>
-	<string name="effect_CreepyBot">
-		UnheimlicherBot
-	</string>
-	<string name="effect_Cyber">
-		Cyber
-	</string>
-	<string name="effect_DeepBot">
-		TieferBot
-	</string>
-	<string name="effect_Demon">
-		Dämon
-	</string>
-	<string name="effect_Female Elf">
-		Weibliche Elfe
-	</string>
-	<string name="effect_Flirty">
-		Kokett
-	</string>
-	<string name="effect_Foxy">
-		Attraktiv
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		Bonus_Halloween_2010
-	</string>
-	<string name="effect_Helium">
-		Helium
-	</string>
-	<string name="effect_Husky">
-		Rauchig
-	</string>
-	<string name="effect_Husky Whisper">
-		Rauchiges Flüstern
-	</string>
-	<string name="effect_Intercom">
-		Intercom
-	</string>
-	<string name="effect_Julia">
-		Julia
-	</string>
-	<string name="effect_Lo Lilt">
-		Leises Trällern
-	</string>
-	<string name="effect_Macho">
-		Macho
-	</string>
-	<string name="effect_Micro">
-		Micro
-	</string>
-	<string name="effect_Mini">
-		Mini
-	</string>
-	<string name="effect_Model">
-		Modell
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		Alptraum
-	</string>
-	<string name="effect_PopBot">
-		PopBot
-	</string>
-	<string name="effect_Rachel">
-		Rachel
-	</string>
-	<string name="effect_Radio">
-		Radio
-	</string>
-	<string name="effect_Robot">
-		Roboter
-	</string>
-	<string name="effect_Roxanne">
-		Roxanne
-	</string>
-	<string name="effect_Rumble">
-		Rumpeln
-	</string>
-	<string name="effect_Sabrina">
-		Sabrina
-	</string>
-	<string name="effect_Samantha">
-		Samantha
-	</string>
-	<string name="effect_Sexy">
-		Sexy
-	</string>
-	<string name="effect_Shorty">
-		Shorty
-	</string>
-	<string name="effect_Smaller">
-		Kleiner
-	</string>
-	<string name="effect_Sneaky">
-		Hinterhältig
-	</string>
-	<string name="effect_Stallion">
-		Hengst
-	</string>
-	<string name="effect_Sultry">
-		Feurig
-	</string>
-	<string name="effect_Thunder">
-		Donner
-	</string>
-	<string name="effect_Vixen">
-		Erotisch
-	</string>
-	<string name="effect_WhinyBot">
-		JammernderBot
-	</string>
-	<text name="preview_text">
-		Zur Vorschau
-	</text>
-	<text name="status_text">
-		Stimme aufnehmen und auf einen Effekt klicken, um diesen auf Ihre Stimme anzuwenden.
-	</text>
-	<button label="Aufnehmen" name="record_btn" tool_tip="Nehmen Sie Ihre Stimme auf."/>
-	<button label="Stopp" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] Jetzt abonnieren]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Nehmen Sie Ihre Stimme auf und klicken Sie dann auf einen Effekt, um diesen auszuprobieren.">
-		<scroll_list.columns label="Bezeichnung" name="name"/>
-		<scroll_list.columns label="Gültig bis" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/de/panel_voice_effect.xml b/indra/newview/skins/default/xui/de/panel_voice_effect.xml
deleted file mode 100644
index 533deb8597..0000000000
--- a/indra/newview/skins/default/xui/de/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Voice-Morphing Aus
-	</string>
-	<string name="preview_voice_effects">
-		Voice-Morphing ausprobieren ▶
-	</string>
-	<string name="get_voice_effects">
-		Voice-Morphing abonnieren ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Wählen Sie einen Voice-Morph-Effekt aus, um Ihre Stimme zu verändern.">
-		<combo_box.item label="Voice-Morphing Aus" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/en/floater_big_preview.xml b/indra/newview/skins/default/xui/en/floater_big_preview.xml
deleted file mode 100644
index 362853d06f..0000000000
--- a/indra/newview/skins/default/xui/en/floater_big_preview.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
-  positioning="cascading"
-  can_close="true"
-  can_resize="true"
-  can_minimize="false"
-  help_topic="floater_big_preview"
-  layout="topleft"
-  name="floater_big_preview"
-  save_rect="true"
-  single_instance="true"
-  reuse_instance="true"
-  title="PREVIEW"
-  height="465"
-  width="770">
-  <panel
-   height="450"
-   width="750"
-   visible="true"
-   name="big_preview_placeholder"
-   top="5"
-   follows="all"
-   left="10">
-  </panel>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_post_process.xml b/indra/newview/skins/default/xui/en/floater_post_process.xml
deleted file mode 100644
index 37339f79c8..0000000000
--- a/indra/newview/skins/default/xui/en/floater_post_process.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- legacy_header_height="18"
- height="400"
- layout="topleft"
- name="Post-Process Floater"
- help_topic="post_process_floater"
- title="POST-PROCESS SETTINGS"
- width="400">
-    <tab_container
-     follows="left|top"
-     height="400"
-     layout="topleft"
-     left="0"
-     name="Post-Process Tabs"
-     tab_position="top"
-     top="0"
-     width="400">
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Color Filter"
-         layout="topleft"
-         left="1"
-         mouse_opaque="false"
-         help_topic="post_process_color_filter_tab"
-         name="wmiColorFilterPanel"
-         top="0"
-         width="398">
-            <check_box
-             control_name="wmiColorFilterToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiColorFilterToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterBrightnessText"
-             top_pad="4"
-             width="355">
-                Brightness
-            </text>
-            <slider
-             control_name="wmiColorFilterBrightness"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="4"
-             name="wmiColorFilterBrightness"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterSaturationText"
-             top_pad="4"
-             width="355">
-                Saturation
-            </text>
-            <slider
-             control_name="wmiColorFilterSaturation"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="2"
-             min_val="-1"
-             name="wmiColorFilterSaturation"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterContrastText"
-             top_pad="4"
-             width="355">
-                Contrast
-            </text>
-            <slider
-             control_name="wmiColorFilterContrast"
-             decimal_digits="2"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="4"
-             name="wmiColorFilterContrast"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiColorFilterBaseText"
-             top_pad="4"
-             width="355">
-                Contrast Base Color
-            </text>
-            <slider
-             control_name="wmiColorFilterBaseR"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="R"
-             layout="topleft"
-             left_delta="4"
-             name="wmiColorFilterBaseR"
-             top_pad="20"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseG"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="G"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseG"
-             top_pad="10"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseB"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.0"
-             label="B"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseB"
-             top_pad="10"
-             width="200" />
-            <slider
-             control_name="wmiColorFilterBaseI"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.5"
-             label="I"
-             layout="topleft"
-             left_delta="0"
-             name="wmiColorFilterBaseI"
-             top_pad="10"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Night Vision"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="post_process_night_vision_tab"
-         name="wmiNightVisionPanel"
-         top_delta="-236"
-         width="398">
-            <check_box
-             control_name="wmiNightVisionToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiNightVisionToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionBrightMultText"
-             top_pad="5"
-             width="355">
-                Light Amplification Multiple
-            </text>
-            <slider
-             control_name="wmiNightVisionBrightMult"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="3.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="10"
-             min_val="1"
-             name="wmiNightVisionBrightMult"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionNoiseSizeText"
-             top_pad="4"
-             width="355">
-                Noise Size
-            </text>
-            <slider
-             control_name="wmiNightVisionNoiseSize"
-             follows="left"
-             height="10"
-             initial_value="1"
-             layout="topleft"
-             left_delta="4"
-             max_val="100"
-             min_val="1"
-             name="wmiNightVisionNoiseSize"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiNightVisionNoiseStrengthText"
-             top_pad="4"
-             width="355">
-                Noise Strength
-            </text>
-            <slider
-             control_name="wmiNightVisionNoiseStrength"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.3"
-             layout="topleft"
-             left_delta="4"
-             name="wmiNightVisionNoiseStrength"
-             top_pad="20"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Bloom"
-         layout="topleft"
-         left_delta="0"
-         help_topic="post_process_bloom_tab"
-         name="wmiBloomPanel"
-         top_delta="-236"
-         width="398">
-            <check_box
-             control_name="wmiBloomToggle"
-             height="16"
-             label="Enable"
-             layout="topleft"
-             left="14"
-             name="wmiBloomToggle"
-             top="4"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomExtractText"
-             top_pad="5"
-             width="355">
-                Luminosity Extraction
-            </text>
-            <slider
-             control_name="wmiBloomExtract"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="0.9"
-             layout="topleft"
-             left_delta="4"
-             name="wmiBloomExtract"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomSizeText"
-             top_pad="4"
-             width="355">
-                Bloom Size
-            </text>
-            <slider
-             control_name="wmiBloomSize"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="3.0"
-             layout="topleft"
-             left_delta="4"
-             max_val="20"
-             name="wmiBloomSize"
-             top_pad="20"
-             width="200" />
-            <text
-             type="string"
-             length="1"
-             follows="left|top|right"
-             font="SansSerif"
-             height="16"
-             layout="topleft"
-             left_delta="-4"
-             name="wmiBloomStrengthText"
-             top_pad="4"
-             width="355">
-                Bloom Strength
-            </text>
-            <slider
-             control_name="wmiBloomStrength"
-             follows="left"
-             height="10"
-             increment="0.01"
-             initial_value="1.2"
-             layout="topleft"
-             left_delta="4"
-             max_val="10"
-             name="wmiBloomStrength"
-             top_pad="20"
-             width="200" />
-        </panel>
-        <panel
-         border="true"
-         follows="left|top|right|bottom"
-         height="400"
-         label="Extras"
-         layout="topleft"
-         left_delta="0"
-         mouse_opaque="false"
-         help_topic="post_process_extras_tab"
-         name="Extras"
-         top_delta="-236"
-         width="398">
-            <button
-             height="20"
-             label="LoadEffect"
-             label_selected="LoadEffect"
-             layout="topleft"
-             left="15"
-             name="PPLoadEffect"
-             top="13"
-             width="100" />
-            <button
-             height="20"
-             label="SaveEffect"
-             label_selected="SaveEffect"
-             layout="topleft"
-             left_delta="0"
-             name="PPSaveEffect"
-             top_pad="7"
-             width="100" />
-            <combo_box
-             height="18"
-             layout="topleft"
-             left_delta="120"
-             name="PPEffectsCombo"
-             top="15"
-             width="150" />
-            <line_editor
-             border_style="line"
-             border_thickness="1"
-             follows="left|right|bottom"
-             font="SansSerif"
-             height="20"
-             label="Effect Name"
-             layout="topleft"
-             left_delta="0"
-             max_length_bytes="40"
-             name="PPEffectNameEditor"
-             tab_group="1"
-             top_pad="22"
-             width="150" />
-        </panel>
-    </tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_sound_devices.xml b/indra/newview/skins/default/xui/en/floater_sound_devices.xml
deleted file mode 100644
index dec0e9b6c6..0000000000
--- a/indra/newview/skins/default/xui/en/floater_sound_devices.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- border_visible="false"
- border="false"
- legacy_header_height="18"
- can_minimize="true"
- can_resize="false"
- can_close="false"
- chrome="true"
- save_dock_state="true"
- save_visibility="true"
- save_rect="true"
- single_instance="true"
- bevel_style="in"
- height="164"
- layout="topleft"
- name="floater_sound_devices"
- title="SOUND DEVICES"
- width="490">
-  <panel
-    layout="topleft"
-    follows="all"
-    filename="panel_sound_devices.xml"
-    name="device_settings_panel"
-    width="400"
-    left="10"
-    top="26"
-    class="panel_voice_device_settings"/>
-  <text
-    name="voice_label"
-    top="136"
-    left="12"
-    height="14"
-    width="80"
-    layout="topleft"
-    >Voice Chat</text>
-  <check_box
-    layout="topleft"
-    control_name="EnableVoiceChat"
-    follows="bottom|left"
-    top="138"
-    left="80"
-    name="enable_voice"
-    width="100"
-    height="14"
-    label="Enabled"
-    />
-</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_voice_effect.xml b/indra/newview/skins/default/xui/en/floater_voice_effect.xml
deleted file mode 100644
index d037bdb813..0000000000
--- a/indra/newview/skins/default/xui/en/floater_voice_effect.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater
- legacy_header_height="27"
- can_resize="true"
- height="500"
- name="voice_effects"
- help_topic="voice_effects"
- title="VOICE MORPHING PREVIEW"
- background_visible="true"
- label="Places"
- layout="topleft"
- min_height="360"
- min_width="200"
- save_rect="true"
- width="300">
-  <string name="no_voice_effect">
-    (No Voice Morph)
-  </string>
-  <string name="active_voice_effect">
-    (Active)
-  </string>
-  <string name="unsubscribed_voice_effect">
-    (Unsubscribed)
-  </string>
-  <string name="new_voice_effect">
-    (New!)
-  </string>
-
-  <!--  effect names begin -->
-  <string name="effect_Arena">Arena</string>
-  <string name="effect_Beast">Beast</string>
-  <string name="effect_Buff">Buff</string>
-  <string name="effect_Buzz">Buzz</string>
-  <string name="effect_Camille">Camille</string>
-  <string name="effect_Creepy">Creepy</string>
-  <string name="effect_CreepyBot">CreepyBot</string>
-  <string name="effect_Cyber">Cyber</string>
-  <string name="effect_DeepBot">DeepBot</string>
-  <string name="effect_Demon">Demon</string>
-  <string name="effect_Female Elf">Female Elf</string>
-  <string name="effect_Flirty">Flirty</string>
-  <string name="effect_Foxy">Foxy</string>
-  <string name="effect_Halloween 2010 Bonus">Halloween_2010_Bonus</string>
-  <string name="effect_Helium">Helium</string>
-  <string name="effect_Husky">Husky</string>
-  <string name="effect_Husky Whisper">Husky Whisper</string>
-  <string name="effect_Intercom">Intercom</string>
-  <string name="effect_Julia">Julia</string>
-  <string name="effect_Lo Lilt">Lo Lilt</string>
-  <string name="effect_Macho">Macho</string>
-  <string name="effect_Micro">Micro</string>
-  <string name="effect_Mini">Mini</string>
-  <string name="effect_Model">Model</string>
-  <string name="effect_Nano">Nano</string>
-  <string name="effect_Nightmare">Nightmare</string>
-  <string name="effect_PopBot">PopBot</string>
-  <string name="effect_Rachel">Rachel</string>
-  <string name="effect_Radio">Radio</string>
-  <string name="effect_Robot">Robot</string>
-  <string name="effect_Roxanne">Roxanne</string>
-  <string name="effect_Rumble">Rumble</string>
-  <string name="effect_Sabrina">Sabrina</string>
-  <string name="effect_Samantha">Samantha</string>
-  <string name="effect_Sexy">Sexy</string>
-  <string name="effect_Shorty">Shorty</string>
-  <string name="effect_Smaller">Smaller</string>
-  <string name="effect_Sneaky">Sneaky</string>
-  <string name="effect_Stallion">Stallion</string>
-  <string name="effect_Sultry">Sultry</string>
-  <string name="effect_Thunder">Thunder</string>
-  <string name="effect_Vixen">Vixen</string>
-  <string name="effect_WhinyBot">WhinyBot</string>
-  <!--  effect names end -->
-
- <text
-   height="16"
-   word_wrap="true"
-   use_ellipses="true"
-   type="string"
-   follows="left|top|right"
-   layout="topleft"
-   font="SansSerifBold"
-   color="White"
-   left="10"
-   name="preview_text"
-   right="-10"
-   top="27">To Preview
-   </text>
-  <text
-   height="23"
-   word_wrap="true"
-   use_ellipses="true"
-   type="string"
-   follows="left|top|right"
-   layout="topleft"
-   left="10"
-   name="status_text"
-   right="-5"
-   top_pad="0">
-Record a sample, then click on a voice to hear how it will sound.
-  </text>
-  <button
-   follows="left|top"
-   height="23"
-   label="Record"
-   layout="topleft"
-   left="10"
-   name="record_btn"
-   tool_tip="Record a sample of your voice."
-   top_pad="5"
-   width="100">
-    <button.commit_callback
-     function="VoiceEffect.Record" />
-  </button>
-  <button
-   follows="left|top"
-   height="23"
-   label="Stop"
-   layout="topleft"
-   left_delta="0"
-   name="record_stop_btn"
-   top_delta="0"
-   width="100">
-    <button.commit_callback
-     function="VoiceEffect.Stop" />
-  </button>
-  <text
-   height="23"
-   halign="right"
-   use_ellipses="true"
-   type="string"
-   follows="left|top|right"
-   layout="topleft"
-   left_pad="10"
-   top_delta="10"
-   name="voice_morphing_link"
-   right="-10">
-    [[URL] Subscribe Now]
-  </text>
-  <scroll_list
-   bottom="-10"
-   draw_heading="true"
-   follows="all"
-   layout="topleft"
-   left="10"
-   multi_select="false"
-   name="voice_effect_list"
-   right="-10"
-   tool_tip="Record a sample of your voice, then click an effect to preview."
-   top="95">
-    <scroll_list.columns
-     label="Voice Name"
-     name="name"
-     relative_width="0.60" />
-    <scroll_list.columns
-     dynamic_width="true"
-     label="Expires"
-     name="expires"
-     relative_width="0.30" />
-  </scroll_list>
-
-</floater>
diff --git a/indra/newview/skins/default/xui/en/panel_voice_effect.xml b/indra/newview/skins/default/xui/en/panel_voice_effect.xml
deleted file mode 100644
index 42cd510efd..0000000000
--- a/indra/newview/skins/default/xui/en/panel_voice_effect.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel
- follows="all"
- height="26"
- layout="topleft"
- name="panel_voice_effect"
- width="200">
-  <string name="no_voice_effect">
-    Voice Morphing Off
-  </string>
-  <string name="preview_voice_effects">
-    Preview Voice Morphing  ▶
-  </string>
-  <string name="get_voice_effects">
-    Get Voice Morphing  ▶
-  </string>
-  <combo_box
-   enabled="false"
-   follows="left|top|right"
-   height="23"
-   name="voice_effect"
-   tool_tip="Select a Voice Morph to change your voice"
-   top_pad="0"
-   width="200">
-    <combo_box.item
-     label="Voice Morphing Off"
-     name="no_voice_effect"
-	 top_pad="0"
-     value="0" />
-    <combo_box.commit_callback
-     function="Voice.CommitVoiceEffect" />
-  </combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/es/floater_big_preview.xml b/indra/newview/skins/default/xui/es/floater_big_preview.xml
deleted file mode 100644
index b112243d7a..0000000000
--- a/indra/newview/skins/default/xui/es/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="VISTA PREVIA"/>
diff --git a/indra/newview/skins/default/xui/es/floater_post_process.xml b/indra/newview/skins/default/xui/es/floater_post_process.xml
deleted file mode 100644
index 5c62ccde36..0000000000
--- a/indra/newview/skins/default/xui/es/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="CONFIGURACIÓN DEL PROCESAMIENTO">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Color del filtro" name="wmiColorFilterPanel">
-			<check_box label="Activar" name="wmiColorFilterToggle"/>
-			<text name="wmiColorFilterBrightnessText">
-				Brillo
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Saturación
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Contraste
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Color base del contraste
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR"/>
-			<slider label="V" name="wmiColorFilterBaseG"/>
-			<slider label="A" name="wmiColorFilterBaseB"/>
-			<slider label="I" name="wmiColorFilterBaseI"/>
-		</panel>
-		<panel label="Visión nocturna" name="wmiNightVisionPanel">
-			<check_box label="Activar" name="wmiNightVisionToggle"/>
-			<text name="wmiNightVisionBrightMultText">
-				Amplificación de luz
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Cantidad de ruido
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Intensidad del ruido
-			</text>
-		</panel>
-		<panel label="Bloom" name="wmiBloomPanel">
-			<check_box label="Activar" name="wmiBloomToggle"/>
-			<text name="wmiBloomExtractText">
-				Extracción de la luminosidad
-			</text>
-			<text name="wmiBloomSizeText">
-				Bloom: cantidad
-			</text>
-			<text name="wmiBloomStrengthText">
-				Bloom: intensidad
-			</text>
-		</panel>
-		<panel label="Extras" name="Extras">
-			<button label="Cargar efecto" label_selected="Cargar efecto" name="PPLoadEffect"/>
-			<button label="Guardar efecto" label_selected="Guardar efecto" name="PPSaveEffect"/>
-			<line_editor label="Nombre del efecto" name="PPEffectNameEditor"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_sound_devices.xml b/indra/newview/skins/default/xui/es/floater_sound_devices.xml
deleted file mode 100644
index 0291f9e796..0000000000
--- a/indra/newview/skins/default/xui/es/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="DISPOSITIVOS DE SONIDO">
-	<text name="voice_label">
-		Chat de voz
-	</text>
-	<check_box label="Activados" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/floater_voice_effect.xml b/indra/newview/skins/default/xui/es/floater_voice_effect.xml
deleted file mode 100644
index 02ebe80ff7..0000000000
--- a/indra/newview/skins/default/xui/es/floater_voice_effect.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="PROBAR TRANSFORMACIÓN DE VOZ">
-	<string name="no_voice_effect">
-		(Sin transformación de voz)
-	</string>
-	<string name="active_voice_effect">
-		(Activo)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Suscripción cancelada)
-	</string>
-	<string name="new_voice_effect">
-		(¡Nuevo!)
-	</string>
-	<string name="effect_Arena">
-		Campo
-	</string>
-	<string name="effect_Beast">
-		Bestia
-	</string>
-	<string name="effect_Buff">
-		Musculoso
-	</string>
-	<string name="effect_Buzz">
-		Murmullo
-	</string>
-	<string name="effect_Camille">
-		Camila
-	</string>
-	<string name="effect_Creepy">
-		Aterrador
-	</string>
-	<string name="effect_CreepyBot">
-		Robot aterrador
-	</string>
-	<string name="effect_Cyber">
-		Cyber
-	</string>
-	<string name="effect_DeepBot">
-		Robot profundo
-	</string>
-	<string name="effect_Demon">
-		Diablo
-	</string>
-	<string name="effect_Flirty">
-		Coqueta
-	</string>
-	<string name="effect_Foxy">
-		Astuto
-	</string>
-	<string name="effect_Halloween_2010_Bonus">
-		Halloween_2010_Bonus
-	</string>
-	<string name="effect_Helium">
-		Helio
-	</string>
-	<string name="effect_Husky">
-		Corpulento
-	</string>
-	<string name="effect_Intercom">
-		Intercom
-	</string>
-	<string name="effect_Macho">
-		Macho
-	</string>
-	<string name="effect_Micro">
-		Micro
-	</string>
-	<string name="effect_Mini">
-		Mini
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		Pesadilla
-	</string>
-	<string name="effect_PopBot">
-		Robot pop
-	</string>
-	<string name="effect_Rachel">
-		Raquel
-	</string>
-	<string name="effect_Radio">
-		Radio
-	</string>
-	<string name="effect_Robot">
-		Robot
-	</string>
-	<string name="effect_Roxanne">
-		Roxana
-	</string>
-	<string name="effect_Sabrina">
-		Sabrina
-	</string>
-	<string name="effect_Samantha">
-		Samanta
-	</string>
-	<string name="effect_Sexy">
-		Sexy
-	</string>
-	<string name="effect_Shorty">
-		Bajito
-	</string>
-	<string name="effect_Sneaky">
-		Furtivo
-	</string>
-	<string name="effect_Stallion">
-		Mujeriego
-	</string>
-	<string name="effect_Sultry">
-		Sensual
-	</string>
-	<string name="effect_Thunder">
-		Trueno
-	</string>
-	<string name="effect_Vixen">
-		Tigresa
-	</string>
-	<string name="effect_WhinyBot">
-		Robot llorica
-	</string>
-	<text name="preview_text">
-		Para probarla
-	</text>
-	<text name="status_text">
-		Graba una muestra y pulsa en una voz para escuchar cómo suena.
-	</text>
-	<button label="Grabar" name="record_btn" tool_tip="Graba una muestra de tu voz."/>
-	<button label="Parar" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] Suscríbete ahora]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Graba una muestra de tu voz y pulsa en un efecto para ver cómo suena.">
-		<scroll_list.columns label="Nombre de la voz" name="name"/>
-		<scroll_list.columns label="Caduca" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/es/panel_voice_effect.xml b/indra/newview/skins/default/xui/es/panel_voice_effect.xml
deleted file mode 100644
index 94a0428941..0000000000
--- a/indra/newview/skins/default/xui/es/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Transformación de voz desactivada
-	</string>
-	<string name="preview_voice_effects">
-		Probar transformación de voz  ▶
-	</string>
-	<string name="get_voice_effects">
-		Obtener transformación de voz  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Selecciona una transformación de voz para cambiar tu voz">
-		<combo_box.item label="Transformación de voz desactivada" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/fr/floater_big_preview.xml b/indra/newview/skins/default/xui/fr/floater_big_preview.xml
deleted file mode 100644
index 0c09a4c188..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="APERÇU"/>
diff --git a/indra/newview/skins/default/xui/fr/floater_post_process.xml b/indra/newview/skins/default/xui/fr/floater_post_process.xml
deleted file mode 100644
index a22c7512e5..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_post_process.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Post-Process Floater" title="PARAMÈTRES POST-TRAITEMENT">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Filtre couleur" name="wmiColorFilterPanel">
-			<check_box label="Activer" name="wmiColorFilterToggle" />
-			<text name="wmiColorFilterBrightnessText">
-				Luminosité
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Saturation
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Contraste
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Couleur de base du contraste
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR" />
-			<slider label="V" name="wmiColorFilterBaseG" />
-			<slider label="B" name="wmiColorFilterBaseB" />
-			<slider label="I" name="wmiColorFilterBaseI" />
-		</panel>
-		<panel label="Vision de nuit" name="wmiNightVisionPanel">
-			<check_box label="Activer" name="wmiNightVisionToggle" />
-			<text name="wmiNightVisionBrightMultText">
-				Multiple d&apos;amplificateur de lumière
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Taille du bruit
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Force du bruit
-			</text>
-		</panel>
-		<panel label="Éclat" name="wmiBloomPanel">
-			<check_box label="Activer" name="wmiBloomToggle" />
-			<text name="wmiBloomExtractText">
-				Extraction de la luminosité
-			</text>
-			<text name="wmiBloomSizeText">
-				Taille de l&apos;éclat
-			</text>
-			<text name="wmiBloomStrengthText">
-				Force de l&apos;éclat
-			</text>
-		</panel>
-		<panel label="Extras" name="Extras">
-			<button label="Charger effet" label_selected="Charger effet" name="PPLoadEffect" />
-			<button label="Enregistrer effet" label_selected="Enregistrer effet"
-			     name="PPSaveEffect" />
-			<line_editor label="Nom de l&apos;effet" name="PPEffectNameEditor" />
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml b/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
deleted file mode 100644
index 080ade9dd4..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="PERIPHERIQUES AUDIO">
-	<text name="voice_label">
-		Chat vocal
-	</text>
-	<check_box label="Activé" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml b/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
deleted file mode 100644
index f9a76d127e..0000000000
--- a/indra/newview/skins/default/xui/fr/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Endroits" name="voice_effects" title="APERÇU DES EFFETS DE VOIX">
-	<string name="no_voice_effect">
-		(Aucun effet de voix)
-	</string>
-	<string name="active_voice_effect">
-		(Actif)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Pas d&apos;abonnement)
-	</string>
-	<string name="new_voice_effect">
-		(Nouveau !)
-	</string>
-	<string name="effect_Arena">
-		Stade
-	</string>
-	<string name="effect_Beast">
-		Brute
-	</string>
-	<string name="effect_Buff">
-		Nasal
-	</string>
-	<string name="effect_Buzz">
-		Friture
-	</string>
-	<string name="effect_Camille">
-		Camille
-	</string>
-	<string name="effect_Creepy">
-		Effrayant
-	</string>
-	<string name="effect_CreepyBot">
-		BotEffrayant
-	</string>
-	<string name="effect_Cyber">
-		Cyber
-	</string>
-	<string name="effect_DeepBot">
-		BotGrave
-	</string>
-	<string name="effect_Demon">
-		Démon
-	</string>
-	<string name="effect_Female Elf">
-		Femme elfe
-	</string>
-	<string name="effect_Flirty">
-		Flirt
-	</string>
-	<string name="effect_Foxy">
-		Séduction
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		Halloween_2010_Bonus
-	</string>
-	<string name="effect_Helium">
-		Hélium
-	</string>
-	<string name="effect_Husky">
-		Rauque
-	</string>
-	<string name="effect_Husky Whisper">
-		Murmure rauque
-	</string>
-	<string name="effect_Intercom">
-		Interphone
-	</string>
-	<string name="effect_Julia">
-		Julia
-	</string>
-	<string name="effect_Lo Lilt">
-		Mélodieux
-	</string>
-	<string name="effect_Macho">
-		Macho
-	</string>
-	<string name="effect_Micro">
-		Micro
-	</string>
-	<string name="effect_Mini">
-		Mini
-	</string>
-	<string name="effect_Model">
-		Modèle
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		Cauchemar
-	</string>
-	<string name="effect_PopBot">
-		BotPop
-	</string>
-	<string name="effect_Rachel">
-		Rachel
-	</string>
-	<string name="effect_Radio">
-		Radio
-	</string>
-	<string name="effect_Robot">
-		Robot
-	</string>
-	<string name="effect_Roxanne">
-		Roxanne
-	</string>
-	<string name="effect_Rumble">
-		Grondement
-	</string>
-	<string name="effect_Sabrina">
-		Sabrina
-	</string>
-	<string name="effect_Samantha">
-		Samantha
-	</string>
-	<string name="effect_Sexy">
-		Sexy
-	</string>
-	<string name="effect_Shorty">
-		Petite voix
-	</string>
-	<string name="effect_Smaller">
-		Plus faible
-	</string>
-	<string name="effect_Sneaky">
-		Sournois
-	</string>
-	<string name="effect_Stallion">
-		Étalon
-	</string>
-	<string name="effect_Sultry">
-		Sensuel
-	</string>
-	<string name="effect_Thunder">
-		Tonnerre
-	</string>
-	<string name="effect_Vixen">
-		Mégère
-	</string>
-	<string name="effect_WhinyBot">
-		BotPleurnichard
-	</string>
-	<text name="preview_text">
-		Aperçu
-	</text>
-	<text name="status_text">
-		Enregistrez un extrait et cliquez sur un effet pour obtenir un aperçu.
-	</text>
-	<button label="Enregistrer" name="record_btn" tool_tip="Enregistrez un extrait de votre voix."/>
-	<button label="Arrêter" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] S&apos;abonner]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Enregistrez un extrait de votre voix, puis cliquez sur un effet pour obtenir un aperçu.">
-		<scroll_list.columns label="Nom de l&apos;effet" name="name"/>
-		<scroll_list.columns label="Date d&apos;expiration" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml b/indra/newview/skins/default/xui/fr/panel_voice_effect.xml
deleted file mode 100644
index a134854706..0000000000
--- a/indra/newview/skins/default/xui/fr/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Effet de voix désactivé
-	</string>
-	<string name="preview_voice_effects">
-		Aperçu des effets de voix  ▶
-	</string>
-	<string name="get_voice_effects">
-		Obtenir un effet de voix  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Sélectionner un effet pour modifier le son de votre voix">
-		<combo_box.item label="Effet de voix désactivé" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/it/floater_big_preview.xml b/indra/newview/skins/default/xui/it/floater_big_preview.xml
deleted file mode 100644
index 7bc50a6d39..0000000000
--- a/indra/newview/skins/default/xui/it/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="ANTEPRIMA"/>
diff --git a/indra/newview/skins/default/xui/it/floater_post_process.xml b/indra/newview/skins/default/xui/it/floater_post_process.xml
deleted file mode 100644
index 3aa8b29101..0000000000
--- a/indra/newview/skins/default/xui/it/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="IMPOSTAZIONI DI POST-PRODUZIONE">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Filtro Colore" name="wmiColorFilterPanel">
-			<check_box label="Abilita" name="wmiColorFilterToggle"/>
-			<text name="wmiColorFilterBrightnessText">
-				Luminosità
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Saturazione
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Contrasto
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Colore Base Contrasto
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR"/>
-			<slider label="G" name="wmiColorFilterBaseG"/>
-			<slider label="B" name="wmiColorFilterBaseB"/>
-			<slider label="I" name="wmiColorFilterBaseI"/>
-		</panel>
-		<panel label="Visione Notturna" name="wmiNightVisionPanel">
-			<check_box label="Abilita" name="wmiNightVisionToggle"/>
-			<text name="wmiNightVisionBrightMultText">
-				Amplificazione Multipla Luce
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Ampiezza disturbo
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Forza disturbo
-			</text>
-		</panel>
-		<panel label="Raggiatura" name="wmiBloomPanel">
-			<check_box label="Abilita" name="wmiBloomToggle"/>
-			<text name="wmiBloomExtractText">
-				Estrazione luminosità
-			</text>
-			<text name="wmiBloomSizeText">
-				Dimensione raggiatura
-			</text>
-			<text name="wmiBloomStrengthText">
-				Forza raggiatura
-			</text>
-		</panel>
-		<panel label="Extra" name="Extras">
-			<button label="Carica effetto" label_selected="Carica effetto" name="PPLoadEffect"/>
-			<button label="Salva effetto" label_selected="Salva effetto" name="PPSaveEffect"/>
-			<line_editor label="Nome Effetto" name="PPEffectNameEditor"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_sound_devices.xml b/indra/newview/skins/default/xui/it/floater_sound_devices.xml
deleted file mode 100644
index 9799b48d89..0000000000
--- a/indra/newview/skins/default/xui/it/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="DISPOSITIVI AUDIO">
-	<text name="voice_label">
-		Chat vocale
-	</text>
-	<check_box label="Abilitato" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/floater_voice_effect.xml b/indra/newview/skins/default/xui/it/floater_voice_effect.xml
deleted file mode 100644
index f102622f5d..0000000000
--- a/indra/newview/skins/default/xui/it/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Luoghi" name="voice_effects" title="ANTEPRIMA MANIPOLAZIONE VOCE">
-	<string name="no_voice_effect">
-		(Nessuna manipolazione voce)
-	</string>
-	<string name="active_voice_effect">
-		(Attivato)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Iscrizione annullata)
-	</string>
-	<string name="new_voice_effect">
-		(Nuovo!)
-	</string>
-	<string name="effect_Arena">
-		Arena
-	</string>
-	<string name="effect_Beast">
-		Bestia
-	</string>
-	<string name="effect_Buff">
-		Appassionato
-	</string>
-	<string name="effect_Buzz">
-		Euforia
-	</string>
-	<string name="effect_Camille">
-		Camilla
-	</string>
-	<string name="effect_Creepy">
-		Terrificante
-	</string>
-	<string name="effect_CreepyBot">
-		TerrificanteBot
-	</string>
-	<string name="effect_Cyber">
-		Cyber
-	</string>
-	<string name="effect_DeepBot">
-		ProfondoBot
-	</string>
-	<string name="effect_Demon">
-		Demonio
-	</string>
-	<string name="effect_Female Elf">
-		Elfo donna
-	</string>
-	<string name="effect_Flirty">
-		Civettuolo
-	</string>
-	<string name="effect_Foxy">
-		Scaltro
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		Halloween_2010_Bonus
-	</string>
-	<string name="effect_Helium">
-		Elio
-	</string>
-	<string name="effect_Husky">
-		Fusto
-	</string>
-	<string name="effect_Husky Whisper">
-		Sospiro rauco
-	</string>
-	<string name="effect_Intercom">
-		Interfono
-	</string>
-	<string name="effect_Julia">
-		Julia
-	</string>
-	<string name="effect_Lo Lilt">
-		Inflessione bassa
-	</string>
-	<string name="effect_Macho">
-		Macho
-	</string>
-	<string name="effect_Micro">
-		Micro
-	</string>
-	<string name="effect_Mini">
-		Mini
-	</string>
-	<string name="effect_Model">
-		Modella
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		Incubo
-	</string>
-	<string name="effect_PopBot">
-		PopBot
-	</string>
-	<string name="effect_Rachel">
-		Rachele
-	</string>
-	<string name="effect_Radio">
-		Radio
-	</string>
-	<string name="effect_Robot">
-		Robot
-	</string>
-	<string name="effect_Roxanne">
-		Rosanna
-	</string>
-	<string name="effect_Rumble">
-		Rombo
-	</string>
-	<string name="effect_Sabrina">
-		Sabrina
-	</string>
-	<string name="effect_Samantha">
-		Samanta
-	</string>
-	<string name="effect_Sexy">
-		Sexy
-	</string>
-	<string name="effect_Shorty">
-		Bassotto
-	</string>
-	<string name="effect_Smaller">
-		Più piccolo
-	</string>
-	<string name="effect_Sneaky">
-		Vile
-	</string>
-	<string name="effect_Stallion">
-		Stallone
-	</string>
-	<string name="effect_Sultry">
-		Focoso
-	</string>
-	<string name="effect_Thunder">
-		Tuono
-	</string>
-	<string name="effect_Vixen">
-		Maliziosa
-	</string>
-	<string name="effect_WhinyBot">
-		PiangiBot
-	</string>
-	<text name="preview_text">
-		Per l&apos;anteprima
-	</text>
-	<text name="status_text">
-		Registra un campione di voce, quindi fai clic su un effetto per ascoltare il risultato.
-	</text>
-	<button label="Registra" name="record_btn" tool_tip="Registra un campione della tua voce."/>
-	<button label="Ferma" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] Subscribe Now]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Registra un campione della tua voce, quindi fai clic su uno degli effetti per un&apos;anteprima del risultato.">
-		<scroll_list.columns label="Nome effetto" name="name"/>
-		<scroll_list.columns label="Scade il" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/it/panel_voice_effect.xml b/indra/newview/skins/default/xui/it/panel_voice_effect.xml
deleted file mode 100644
index b43f766e5e..0000000000
--- a/indra/newview/skins/default/xui/it/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Disattiva manipolazione voce
-	</string>
-	<string name="preview_voice_effects">
-		Anteprima manipolazione voce  ▶
-	</string>
-	<string name="get_voice_effects">
-		Ottieni manipolazione voce  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Scegli un effetto di manipolazione per modificare il suono della tua voce">
-		<combo_box.item label="Disattiva manipolazione voce" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/ja/floater_big_preview.xml b/indra/newview/skins/default/xui/ja/floater_big_preview.xml
deleted file mode 100644
index e88d6fc488..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="プレビュー"/>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/ja/floater_post_process.xml b/indra/newview/skins/default/xui/ja/floater_post_process.xml
deleted file mode 100644
index 91ecbb73a2..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="ポストプロセス設定">
-	<tab_container name="Post-Process Tabs">
-		<panel label="カラー・フィルタ" name="wmiColorFilterPanel">
-			<check_box label="有効" name="wmiColorFilterToggle"/>
-			<text name="wmiColorFilterBrightnessText">
-				明度
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				彩度
-			</text>
-			<text name="wmiColorFilterContrastText">
-				輝度
-			</text>
-			<text name="wmiColorFilterBaseText">
-				輝度の基準色
-			</text>
-			<slider label="赤" name="wmiColorFilterBaseR"/>
-			<slider label="緑" name="wmiColorFilterBaseG"/>
-			<slider label="青" name="wmiColorFilterBaseB"/>
-			<slider label="I" name="wmiColorFilterBaseI"/>
-		</panel>
-		<panel label="暗視" name="wmiNightVisionPanel">
-			<check_box label="有効" name="wmiNightVisionToggle"/>
-			<text name="wmiNightVisionBrightMultText">
-				光の増幅（マルチ）
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				ノイズ・サイズ
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				ノイズ強度
-			</text>
-		</panel>
-		<panel label="ブルーム" name="wmiBloomPanel">
-			<check_box label="有効" name="wmiBloomToggle"/>
-			<text name="wmiBloomExtractText">
-				明度の抽出
-			</text>
-			<text name="wmiBloomSizeText">
-				ブルーム・サイズ
-			</text>
-			<text name="wmiBloomStrengthText">
-				ブルーム強度
-			</text>
-		</panel>
-		<panel label="その他" name="Extras">
-			<button label="効果読み込み" label_selected="効果読み込み" name="PPLoadEffect"/>
-			<button label="効果保存" label_selected="効果保存" name="PPSaveEffect"/>
-			<line_editor label="効果名" name="PPEffectNameEditor"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml b/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
deleted file mode 100644
index 28d2388bed..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="サウンドデバイス">
-	<text name="voice_label">
-		ボイスチャット
-	</text>
-	<check_box label="有効" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml b/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
deleted file mode 100644
index b38ea9331a..0000000000
--- a/indra/newview/skins/default/xui/ja/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="場所" name="voice_effects" title="ボイスモーフィングのプレビュー">
-	<string name="no_voice_effect">
-		（ボイスモーフィングなし）
-	</string>
-	<string name="active_voice_effect">
-		（アクティブ）
-	</string>
-	<string name="unsubscribed_voice_effect">
-		（取消し済み）
-	</string>
-	<string name="new_voice_effect">
-		（新登場！）
-	</string>
-	<string name="effect_Arena">
-		アリーナ
-	</string>
-	<string name="effect_Beast">
-		野獣
-	</string>
-	<string name="effect_Buff">
-		がっしり
-	</string>
-	<string name="effect_Buzz">
-		ブザー
-	</string>
-	<string name="effect_Camille">
-		カミール
-	</string>
-	<string name="effect_Creepy">
-		気味の悪い
-	</string>
-	<string name="effect_CreepyBot">
-		気味わるボット
-	</string>
-	<string name="effect_Cyber">
-		サイバー
-	</string>
-	<string name="effect_DeepBot">
-		ディープボット
-	</string>
-	<string name="effect_Demon">
-		デーモン
-	</string>
-	<string name="effect_Female Elf">
-		女性のエルフ
-	</string>
-	<string name="effect_Flirty">
-		気のありそうな
-	</string>
-	<string name="effect_Foxy">
-		魅惑的
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		ハロウィン_2010_ボーナス
-	</string>
-	<string name="effect_Helium">
-		ヘリウム
-	</string>
-	<string name="effect_Husky">
-		ハスキー
-	</string>
-	<string name="effect_Husky Whisper">
-		スモーキーウィスパー
-	</string>
-	<string name="effect_Intercom">
-		インターホン
-	</string>
-	<string name="effect_Julia">
-		ジュリア
-	</string>
-	<string name="effect_Lo Lilt">
-		軽快
-	</string>
-	<string name="effect_Macho">
-		マッチョ
-	</string>
-	<string name="effect_Micro">
-		ミクロ
-	</string>
-	<string name="effect_Mini">
-		ミニ
-	</string>
-	<string name="effect_Model">
-		モデル
-	</string>
-	<string name="effect_Nano">
-		ナノ
-	</string>
-	<string name="effect_Nightmare">
-		悪夢
-	</string>
-	<string name="effect_PopBot">
-		ポップボット
-	</string>
-	<string name="effect_Rachel">
-		レイチェル
-	</string>
-	<string name="effect_Radio">
-		ラジオ
-	</string>
-	<string name="effect_Robot">
-		ロボット
-	</string>
-	<string name="effect_Roxanne">
-		ロクサン
-	</string>
-	<string name="effect_Rumble">
-		ランブル
-	</string>
-	<string name="effect_Sabrina">
-		サブリナ
-	</string>
-	<string name="effect_Samantha">
-		サマンサ
-	</string>
-	<string name="effect_Sexy">
-		セクシー
-	</string>
-	<string name="effect_Shorty">
-		チビ
-	</string>
-	<string name="effect_Smaller">
-		小さめ
-	</string>
-	<string name="effect_Sneaky">
-		コソコソ
-	</string>
-	<string name="effect_Stallion">
-		雄馬
-	</string>
-	<string name="effect_Sultry">
-		艶かしい
-	</string>
-	<string name="effect_Thunder">
-		サンダー
-	</string>
-	<string name="effect_Vixen">
-		性悪な
-	</string>
-	<string name="effect_WhinyBot">
-		不機嫌ボット
-	</string>
-	<text name="preview_text">
-		プレビュー
-	</text>
-	<text name="status_text">
-		声をテスト録音してからボイスエフェクトを1つクリックして聞いてみます。
-	</text>
-	<button label="録音" name="record_btn" tool_tip="あなたの声を録音します。"/>
-	<button label="停止" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] 今すぐ申し込む]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="声を録音してボイスモーフィングを1つクリックすると、そのエフェクトをプレビューできます。">
-		<scroll_list.columns label="ボイス名" name="name"/>
-		<scroll_list.columns label="有効期限" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml b/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
deleted file mode 100644
index 57a1bb7838..0000000000
--- a/indra/newview/skins/default/xui/ja/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		ボイスモーフィングなし
-	</string>
-	<string name="preview_voice_effects">
-		ボイスモーフィングをプレビュー
-	</string>
-	<string name="get_voice_effects">
-		ボイスモーフィングを取得
-	</string>
-	<combo_box name="voice_effect" tool_tip="ボイスモーフィングを選択してボイスを変更">
-		<combo_box.item label="ボイスモーフィングなし" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/pl/floater_big_preview.xml b/indra/newview/skins/default/xui/pl/floater_big_preview.xml
deleted file mode 100644
index e730cff618..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<floater name="floater_big_preview" title="PODGLĄD" />
diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml
deleted file mode 100644
index 47c40d2315..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_post_process.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Post-Process Floater" title="USTAWIENIA PRZETWARZANIA KOŃCOWEGO">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Filtr koloru" name="wmiColorFilterPanel">
-			<check_box label="Włącz" name="wmiColorFilterToggle" />
-			<text name="wmiColorFilterBrightnessText">
-				Jasność
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Nasycenie
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Kontrast
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Kontrast koloru podstawowego
-			</text>
-		</panel>
-		<panel label="Noktowizja" name="wmiNightVisionPanel">
-			<check_box label="Włącz" name="wmiNightVisionToggle" />
-			<text name="wmiNightVisionBrightMultText">
-				Wielokrotne wzmocnienie światła
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Rozmiar szumu
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Moc szumu
-			</text>
-		</panel>
-		<panel label="Poświata" name="wmiBloomPanel">
-			<check_box label="Włącz" name="wmiBloomToggle" />
-			<text name="wmiBloomExtractText">
-				Ekstracja luminacji
-			</text>
-			<text name="wmiBloomSizeText">
-				Rozmiar poświaty
-			</text>
-			<text name="wmiBloomStrengthText">
-				Moc poświaty
-			</text>
-		</panel>
-		<panel label="Dodatki" name="Extras">
-			<button label="Wczytaj efekt" label_selected="Wczytaj efekt" name="PPLoadEffect" />
-			<button label="Zapisz efekt" label_selected="Zapisz efekt" name="PPSaveEffect" />
-			<line_editor label="Nazwa efektu" name="PPEffectNameEditor" />
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_sound_devices.xml b/indra/newview/skins/default/xui/pl/floater_sound_devices.xml
deleted file mode 100644
index 93a27f68a7..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="floater_sound_devices" title="URZĄDZENIA DŹWIĘKOWE">
-	<text name="voice_label">
-		Czat głos.
-	</text>
-	<check_box name="enable_voice" label="Włączone" />
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml b/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
deleted file mode 100644
index b02266caa9..0000000000
--- a/indra/newview/skins/default/xui/pl/floater_voice_effect.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="voice_effects" title="PODGLĄD PRZEKSZTAŁCANIA GŁOSU" label="Miejsca">
-	<string name="no_voice_effect">
-		(Bez Przekształcania)
-	</string>
-	<string name="active_voice_effect">
-		(Aktywny)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Bez subskrybcji)
-	</string>
-	<string name="new_voice_effect">
-		(Nowy!)
-	</string>
-	<string name="effect_Beast">
-		Bestia
-	</string>
-	<string name="effect_Buzz">
-		Brzęczenie
-	</string>
-	<string name="effect_Creepy">
-		Przerażający
-	</string>
-	<string name="effect_Cyber">
-		Cybernetyczny
-	</string>
-	<string name="effect_Female Elf">
-		Kobiecy Elf
-	</string>
-	<string name="effect_Flirty">
-		Flirt
-	</string>
-	<string name="effect_Foxy">
-		Ponętny
-	</string>
-	<string name="effect_Helium">
-		Hel
-	</string>
-	<string name="effect_Husky Whisper">
-		Szept Husky
-	</string>
-	<string name="effect_Macho">
-		Maczo
-	</string>
-	<string name="effect_Micro">
-		Mikrus
-	</string>
-	<string name="effect_Mini">
-		Miniaturowy
-	</string>
-	<string name="effect_Nano">
-		Malutki
-	</string>
-	<string name="effect_Nightmare">
-		Koszmar
-	</string>
-	<string name="effect_Rumble">
-		Burczenie
-	</string>
-	<string name="effect_Sexy">
-		Seksowny
-	</string>
-	<string name="effect_Shorty">
-		Krótki
-	</string>
-	<string name="effect_Smaller">
-		Mniejszy
-	</string>
-	<string name="effect_Sneaky">
-		Podstępny
-	</string>
-	<string name="effect_Stallion">
-		Ogier
-	</string>
-	<string name="effect_Sultry">
-		Gorąco
-	</string>
-	<string name="effect_Thunder">
-		Grzmot
-	</string>
-	<string name="effect_Vixen">
-		Lisica
-	</string>
-	<text name="preview_text">
-		Podgląd
-	</text>
-	<text name="status_text">
-		Nagraj próbkę, a następnie kliknij na głos aby usłyszeć jego brzmienie.
-	</text>
-	<button label="Nagraj" name="record_btn" tool_tip="Nagraj próbkę swojego głosu." />
-	<text name="voice_morphing_link">
-		[[URL] Subskrybuj teraz]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Nagraj próbkę swojego głosu, a następnie kliknij na efekt aby odsłuchać podgląd.">
-		<scroll_list.columns label="Nazwa głosu" name="name" />
-		<scroll_list.columns label="Wygasa" name="expires" />
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml b/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
deleted file mode 100644
index 94878943a1..0000000000
--- a/indra/newview/skins/default/xui/pl/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Wyłącz Przekształcanie
-	</string>
-	<string name="preview_voice_effects">
-		Przeglądaj Przekształcania  ▶
-	</string>
-	<string name="get_voice_effects">
-		Uzyskaj Przekształcanie ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Wybierz odpowienie Przekształcanie Głosu, aby zmienić brzmienie swojego głosu">
-		<combo_box.item label="Wyłącz Przekształcanie" name="no_voice_effect" />
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/pt/floater_big_preview.xml b/indra/newview/skins/default/xui/pt/floater_big_preview.xml
deleted file mode 100644
index 76ca176689..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="VISUALIZAR"/>
diff --git a/indra/newview/skins/default/xui/pt/floater_post_process.xml b/indra/newview/skins/default/xui/pt/floater_post_process.xml
deleted file mode 100644
index d4f2e96539..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="AJUSTES DE PÓS-PROCESSAMENTO">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Filtro de Cor" name="wmiColorFilterPanel">
-			<check_box label="Habilitar" name="wmiColorFilterToggle"/>
-			<text name="wmiColorFilterBrightnessText">
-				Brilho
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Saturação
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Contraste
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Cor Base do Contraste
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR"/>
-			<slider label="G" name="wmiColorFilterBaseG"/>
-			<slider label="B" name="wmiColorFilterBaseB"/>
-			<slider label="I" name="wmiColorFilterBaseI"/>
-		</panel>
-		<panel label="visão Noturna" name="wmiNightVisionPanel">
-			<check_box label="Habilitar" name="wmiNightVisionToggle"/>
-			<text name="wmiNightVisionBrightMultText">
-				Múltiplo de Amplificação de Luz
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Tamanho de Ruído
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Intensidade de Ruído
-			</text>
-		</panel>
-		<panel label="Florescência" name="wmiBloomPanel">
-			<check_box label="Habilitar" name="wmiBloomToggle"/>
-			<text name="wmiBloomExtractText">
-				Extração de Luminosidade
-			</text>
-			<text name="wmiBloomSizeText">
-				Tamanho da florescência
-			</text>
-			<text name="wmiBloomStrengthText">
-				Inensidade da florescência
-			</text>
-		</panel>
-		<panel label="Extras" name="Extras">
-			<button label="CarregaEfeito" label_selected="CarregaEfeito" name="PPLoadEffect"/>
-			<button label="SalvaEfeito" label_selected="SalvaEfeito" name="PPSaveEffect"/>
-			<line_editor label="Nome do Efeito" name="PPEffectNameEditor"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml b/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
deleted file mode 100644
index 948d727540..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="DISPOSITIVOS DE SOM">
-	<text name="voice_label">
-		Bate-papo de voz
-	</text>
-	<check_box label="Ativado" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml b/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
deleted file mode 100644
index 71d3c33ae5..0000000000
--- a/indra/newview/skins/default/xui/pt/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Lugares" name="voice_effects" title="AMOSTRA DE DISTORÇÃO DE VOZ">
-	<string name="no_voice_effect">
-		(Não distorcer voz)
-	</string>
-	<string name="active_voice_effect">
-		(Ativo)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Cancelou)
-	</string>
-	<string name="new_voice_effect">
-		(Novo!)
-	</string>
-	<string name="effect_Arena">
-		Arena
-	</string>
-	<string name="effect_Beast">
-		Fera
-	</string>
-	<string name="effect_Buff">
-		Entusiasmado
-	</string>
-	<string name="effect_Buzz">
-		Zumbido
-	</string>
-	<string name="effect_Camille">
-		Camille
-	</string>
-	<string name="effect_Creepy">
-		Assustador
-	</string>
-	<string name="effect_CreepyBot">
-		RobôAssustador
-	</string>
-	<string name="effect_Cyber">
-		Cyber
-	</string>
-	<string name="effect_DeepBot">
-		RobôVozGrossa
-	</string>
-	<string name="effect_Demon">
-		Demônio
-	</string>
-	<string name="effect_Female Elf">
-		Elfa
-	</string>
-	<string name="effect_Flirty">
-		Paquerador
-	</string>
-	<string name="effect_Foxy">
-		Sensual
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		Bônus_Halloween_2010
-	</string>
-	<string name="effect_Helium">
-		Hélio
-	</string>
-	<string name="effect_Husky">
-		Rouco
-	</string>
-	<string name="effect_Husky Whisper">
-		Sussurro rouco
-	</string>
-	<string name="effect_Intercom">
-		Interfone
-	</string>
-	<string name="effect_Julia">
-		Julia
-	</string>
-	<string name="effect_Lo Lilt">
-		Cantarolado baixo
-	</string>
-	<string name="effect_Macho">
-		Macho
-	</string>
-	<string name="effect_Micro">
-		Micro
-	</string>
-	<string name="effect_Mini">
-		Mini
-	</string>
-	<string name="effect_Model">
-		Modelo
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		Pesadelo
-	</string>
-	<string name="effect_PopBot">
-		RobôPop
-	</string>
-	<string name="effect_Rachel">
-		Rachel
-	</string>
-	<string name="effect_Radio">
-		Rádio
-	</string>
-	<string name="effect_Robot">
-		Robô
-	</string>
-	<string name="effect_Roxanne">
-		Roxanne
-	</string>
-	<string name="effect_Rumble">
-		Ronco
-	</string>
-	<string name="effect_Sabrina">
-		Sabrina
-	</string>
-	<string name="effect_Samantha">
-		Samantha
-	</string>
-	<string name="effect_Sexy">
-		Sexy
-	</string>
-	<string name="effect_Shorty">
-		Baixinho
-	</string>
-	<string name="effect_Smaller">
-		Menor
-	</string>
-	<string name="effect_Sneaky">
-		Sorrateiro
-	</string>
-	<string name="effect_Stallion">
-		Garanhão
-	</string>
-	<string name="effect_Sultry">
-		Ardente
-	</string>
-	<string name="effect_Thunder">
-		Trovão
-	</string>
-	<string name="effect_Vixen">
-		Maliciosa
-	</string>
-	<string name="effect_WhinyBot">
-		RobôReclamão
-	</string>
-	<text name="preview_text">
-		Visualizar
-	</text>
-	<text name="status_text">
-		Grave uma amostra da sua voz, depois clique em um efeito para ouvir o resultado.
-	</text>
-	<button label="Gravar" name="record_btn" tool_tip="Grave uma amostra da sua voz."/>
-	<button label="Parar" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] Assine agora]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Grave sua voz por alguns instantes, depois clique num efeito para ouvir a distorção.">
-		<scroll_list.columns label="Nome da voz" name="name"/>
-		<scroll_list.columns label="Vence em" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml b/indra/newview/skins/default/xui/pt/panel_voice_effect.xml
deleted file mode 100644
index 1d7878408a..0000000000
--- a/indra/newview/skins/default/xui/pt/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Distorção de voz desligada
-	</string>
-	<string name="preview_voice_effects">
-		Checar distorção de voz  ▶
-	</string>
-	<string name="get_voice_effects">
-		Distorcer voz  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Selecione um efeito de distorção para mudar sua voz.">
-		<combo_box.item label="Distorção de voz desligada" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/ru/floater_big_preview.xml b/indra/newview/skins/default/xui/ru/floater_big_preview.xml
deleted file mode 100644
index cdacebadef..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="ПРОСМОТР"/>
diff --git a/indra/newview/skins/default/xui/ru/floater_post_process.xml b/indra/newview/skins/default/xui/ru/floater_post_process.xml
deleted file mode 100644
index ae97670548..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="НАСТРОЙКИ ПОСЛЕДУЮЩЕЙ ОБРАБОТКИ">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Цветовой фильтр" name="wmiColorFilterPanel">
-			<check_box label="Вкл." name="wmiColorFilterToggle"/>
-			<text name="wmiColorFilterBrightnessText">
-				Яркость
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Насыщенность
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Контрастность
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Основной цвет контрастности
-			</text>
-			<slider label="К" name="wmiColorFilterBaseR"/>
-			<slider label="З" name="wmiColorFilterBaseG"/>
-			<slider label="С" name="wmiColorFilterBaseB"/>
-			<slider label="И" name="wmiColorFilterBaseI"/>
-		</panel>
-		<panel label="Ночное видение" name="wmiNightVisionPanel">
-			<check_box label="Вкл." name="wmiNightVisionToggle"/>
-			<text name="wmiNightVisionBrightMultText">
-				Коэффициент усиления света
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Размер искажений
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Мощность искажений
-			</text>
-		</panel>
-		<panel label="Ореол" name="wmiBloomPanel">
-			<check_box label="Вкл." name="wmiBloomToggle"/>
-			<text name="wmiBloomExtractText">
-				Яркость света
-			</text>
-			<text name="wmiBloomSizeText">
-				Размер ореола
-			</text>
-			<text name="wmiBloomStrengthText">
-				Мощность ореола
-			</text>
-		</panel>
-		<panel label="Дополнительно" name="Extras">
-			<button label="Загрузить эффект" label_selected="Загрузить эффект" name="PPLoadEffect"/>
-			<button label="Сохранить эффект" label_selected="Сохранить эффект" name="PPSaveEffect"/>
-			<line_editor label="Название эффекта" name="PPEffectNameEditor"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml b/indra/newview/skins/default/xui/ru/floater_sound_devices.xml
deleted file mode 100644
index fc8de858cd..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="ЗВУКОВЫЕ УСТРОЙСТВА">
-	<text name="voice_label">
-		Голосовой чат
-	</text>
-	<check_box label="Включен" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml b/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
deleted file mode 100644
index d3cef042a3..0000000000
--- a/indra/newview/skins/default/xui/ru/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Места" name="voice_effects" title="ПРОСМОТР ИЗМЕНЕНИЯ ГОЛОСА">
-	<string name="no_voice_effect">
-		(Нет изменения голоса)
-	</string>
-	<string name="active_voice_effect">
-		(Активно)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Нет подписки)
-	</string>
-	<string name="new_voice_effect">
-		(Новый!)
-	</string>
-	<string name="effect_Arena">
-		Arena
-	</string>
-	<string name="effect_Beast">
-		Beast
-	</string>
-	<string name="effect_Buff">
-		Buff
-	</string>
-	<string name="effect_Buzz">
-		Buzz
-	</string>
-	<string name="effect_Camille">
-		Camille
-	</string>
-	<string name="effect_Creepy">
-		Creepy
-	</string>
-	<string name="effect_CreepyBot">
-		CreepyBot
-	</string>
-	<string name="effect_Cyber">
-		Cyber
-	</string>
-	<string name="effect_DeepBot">
-		DeepBot
-	</string>
-	<string name="effect_Demon">
-		Demon
-	</string>
-	<string name="effect_Female Elf">
-		Фея
-	</string>
-	<string name="effect_Flirty">
-		Flirty
-	</string>
-	<string name="effect_Foxy">
-		Foxy
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		Бонус_за_Хэллоуин_2010
-	</string>
-	<string name="effect_Helium">
-		Helium
-	</string>
-	<string name="effect_Husky">
-		Husky
-	</string>
-	<string name="effect_Husky Whisper">
-		Хриплый шепот
-	</string>
-	<string name="effect_Intercom">
-		Внутренняя связь
-	</string>
-	<string name="effect_Julia">
-		Julia
-	</string>
-	<string name="effect_Lo Lilt">
-		Напев
-	</string>
-	<string name="effect_Macho">
-		Macho
-	</string>
-	<string name="effect_Micro">
-		Micro
-	</string>
-	<string name="effect_Mini">
-		Mini
-	</string>
-	<string name="effect_Model">
-		Модель
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		Nightmare
-	</string>
-	<string name="effect_PopBot">
-		PopBot
-	</string>
-	<string name="effect_Rachel">
-		Rachel
-	</string>
-	<string name="effect_Radio">
-		Radio
-	</string>
-	<string name="effect_Robot">
-		Robot
-	</string>
-	<string name="effect_Roxanne">
-		Roxanne
-	</string>
-	<string name="effect_Rumble">
-		Урчание
-	</string>
-	<string name="effect_Sabrina">
-		Sabrina
-	</string>
-	<string name="effect_Samantha">
-		Samantha
-	</string>
-	<string name="effect_Sexy">
-		Sexy
-	</string>
-	<string name="effect_Shorty">
-		Shorty
-	</string>
-	<string name="effect_Smaller">
-		Меньше
-	</string>
-	<string name="effect_Sneaky">
-		Sneaky
-	</string>
-	<string name="effect_Stallion">
-		Stallion
-	</string>
-	<string name="effect_Sultry">
-		Sultry
-	</string>
-	<string name="effect_Thunder">
-		Thunder
-	</string>
-	<string name="effect_Vixen">
-		Vixen
-	</string>
-	<string name="effect_WhinyBot">
-		WhinyBot
-	</string>
-	<text name="preview_text">
-		Прослушивание
-	</text>
-	<text name="status_text">
-		Запишите образец, затем щелкните, чтобы услышать, как будет звучать голос.
-	</text>
-	<button label="Запись" name="record_btn" tool_tip="Записать образец вашего голоса."/>
-	<button label="Стоп" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] Подписаться]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Запишите образец вашего голоса, затем щелкните, чтобы прослушать эффект.">
-		<scroll_list.columns label="Название голоса" name="name"/>
-		<scroll_list.columns label="Истекает" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml b/indra/newview/skins/default/xui/ru/panel_voice_effect.xml
deleted file mode 100644
index de0b38198f..0000000000
--- a/indra/newview/skins/default/xui/ru/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Изменение голоса отключено
-	</string>
-	<string name="preview_voice_effects">
-		Прослушать изменение голоса  ▶
-	</string>
-	<string name="get_voice_effects">
-		Приобрести изменение голоса  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Выбор типа изменения для своего голоса">
-		<combo_box.item label="Изменение голоса отключено" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/tr/floater_big_preview.xml b/indra/newview/skins/default/xui/tr/floater_big_preview.xml
deleted file mode 100644
index c99a71d3c2..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="ÖNİZLEME"/>
diff --git a/indra/newview/skins/default/xui/tr/floater_post_process.xml b/indra/newview/skins/default/xui/tr/floater_post_process.xml
deleted file mode 100644
index 5e419f8ffa..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="İŞLEM SONRASI AYARLARI">
-	<tab_container name="Post-Process Tabs">
-		<panel label="Renk Filtresi" name="wmiColorFilterPanel">
-			<check_box label="Etkinleştir" name="wmiColorFilterToggle"/>
-			<text name="wmiColorFilterBrightnessText">
-				Parlaklık
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				Doygunluk
-			</text>
-			<text name="wmiColorFilterContrastText">
-				Kontrast
-			</text>
-			<text name="wmiColorFilterBaseText">
-				Kontrast Baz Rengi
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR"/>
-			<slider label="G" name="wmiColorFilterBaseG"/>
-			<slider label="B" name="wmiColorFilterBaseB"/>
-			<slider label="I" name="wmiColorFilterBaseI"/>
-		</panel>
-		<panel label="Gece Görüşü" name="wmiNightVisionPanel">
-			<check_box label="Etkinleştir" name="wmiNightVisionToggle"/>
-			<text name="wmiNightVisionBrightMultText">
-				Işık Yükseltme Çarpanı
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				Gürültü Büyüklüğü
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				Gürültü Gücü
-			</text>
-		</panel>
-		<panel label="Işıma" name="wmiBloomPanel">
-			<check_box label="Etkinleştir" name="wmiBloomToggle"/>
-			<text name="wmiBloomExtractText">
-				Parlaklık Çıkarma
-			</text>
-			<text name="wmiBloomSizeText">
-				Işıma Büyüklüğü
-			</text>
-			<text name="wmiBloomStrengthText">
-				Işıma Gücü
-			</text>
-		</panel>
-		<panel label="Ekstralar" name="Extras">
-			<button label="EfektYükle" label_selected="EfektYükle" name="PPLoadEffect"/>
-			<button label="EfektKaydet" label_selected="EfektKaydet" name="PPSaveEffect"/>
-			<line_editor label="Efekt Adı" name="PPEffectNameEditor"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml b/indra/newview/skins/default/xui/tr/floater_sound_devices.xml
deleted file mode 100644
index 470a222d7e..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="SES CİHAZLARI">
-	<text name="voice_label">
-		Sesli Sohbet
-	</text>
-	<check_box label="Etkin" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml b/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
deleted file mode 100644
index 7a157244cd..0000000000
--- a/indra/newview/skins/default/xui/tr/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="Yerler" name="voice_effects" title="SES ŞEKİLLENDİRME ÖNİZLEMESİ">
-	<string name="no_voice_effect">
-		(Ses Şekillendirme Yok)
-	</string>
-	<string name="active_voice_effect">
-		(Etkin)
-	</string>
-	<string name="unsubscribed_voice_effect">
-		(Abonelik İptal)
-	</string>
-	<string name="new_voice_effect">
-		(Yeni!)
-	</string>
-	<string name="effect_Arena">
-		Arena
-	</string>
-	<string name="effect_Beast">
-		Yaratık
-	</string>
-	<string name="effect_Buff">
-		Yapılı
-	</string>
-	<string name="effect_Buzz">
-		Vızıltı
-	</string>
-	<string name="effect_Camille">
-		Camille
-	</string>
-	<string name="effect_Creepy">
-		Korkutucu
-	</string>
-	<string name="effect_CreepyBot">
-		KorkutucuBot
-	</string>
-	<string name="effect_Cyber">
-		Siber
-	</string>
-	<string name="effect_DeepBot">
-		DerinBot
-	</string>
-	<string name="effect_Demon">
-		İblis
-	</string>
-	<string name="effect_Female Elf">
-		Dişi Cin
-	</string>
-	<string name="effect_Flirty">
-		Cilveli
-	</string>
-	<string name="effect_Foxy">
-		Alımlı
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		Halloween_2010_Bonus
-	</string>
-	<string name="effect_Helium">
-		Helyum
-	</string>
-	<string name="effect_Husky">
-		Güçlü
-	</string>
-	<string name="effect_Husky Whisper">
-		Boğuk Fısıltı
-	</string>
-	<string name="effect_Intercom">
-		İnterkom
-	</string>
-	<string name="effect_Julia">
-		Julia
-	</string>
-	<string name="effect_Lo Lilt">
-		Yavaş Mırıltı
-	</string>
-	<string name="effect_Macho">
-		Maço
-	</string>
-	<string name="effect_Micro">
-		Mikro
-	</string>
-	<string name="effect_Mini">
-		Mini
-	</string>
-	<string name="effect_Model">
-		Model
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		Kabus
-	</string>
-	<string name="effect_PopBot">
-		PopBot
-	</string>
-	<string name="effect_Rachel">
-		Rachel
-	</string>
-	<string name="effect_Radio">
-		Radyo
-	</string>
-	<string name="effect_Robot">
-		Robot
-	</string>
-	<string name="effect_Roxanne">
-		Roxanne
-	</string>
-	<string name="effect_Rumble">
-		Gurultu
-	</string>
-	<string name="effect_Sabrina">
-		Sabrina
-	</string>
-	<string name="effect_Samantha">
-		Samantha
-	</string>
-	<string name="effect_Sexy">
-		Seksi
-	</string>
-	<string name="effect_Shorty">
-		Bücür
-	</string>
-	<string name="effect_Smaller">
-		Daha Küçük
-	</string>
-	<string name="effect_Sneaky">
-		Sinsi
-	</string>
-	<string name="effect_Stallion">
-		Maskülen
-	</string>
-	<string name="effect_Sultry">
-		İhtiraslı
-	</string>
-	<string name="effect_Thunder">
-		Gök gürültüsü
-	</string>
-	<string name="effect_Vixen">
-		Çekici
-	</string>
-	<string name="effect_WhinyBot">
-		AğlakBot
-	</string>
-	<text name="preview_text">
-		Önizleme için
-	</text>
-	<text name="status_text">
-		Bir örnek kaydettikten sonra sese tıklayarak nasıl olduğunu duyun.
-	</text>
-	<button label="Kaydet" name="record_btn" tool_tip="Sesinizin örneğini kaydedin."/>
-	<button label="Durdur" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] Hemen Abone Ol]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="Sesinizin örneğini kaydettikten sonra önizleme için bir efekte tıklayın.">
-		<scroll_list.columns label="Ses Adı" name="name"/>
-		<scroll_list.columns label="Bitiş Tarihi" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml b/indra/newview/skins/default/xui/tr/panel_voice_effect.xml
deleted file mode 100644
index b46833d7e6..0000000000
--- a/indra/newview/skins/default/xui/tr/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		Ses Şekillendirme Kapalı
-	</string>
-	<string name="preview_voice_effects">
-		Ses Şekillendirme Önizleme  ▶
-	</string>
-	<string name="get_voice_effects">
-		Ses Şekillendirmeyi Etkinleştir ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="Sesinizi değiştirmek için bir Ses Şekli seçin">
-		<combo_box.item label="Ses Şekillendirme Kapalı" name="no_voice_effect"/>
-	</combo_box>
-</panel>
diff --git a/indra/newview/skins/default/xui/zh/floater_big_preview.xml b/indra/newview/skins/default/xui/zh/floater_big_preview.xml
deleted file mode 100644
index ae68cd7ddf..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_big_preview.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_big_preview" title="預覽"/>
diff --git a/indra/newview/skins/default/xui/zh/floater_post_process.xml b/indra/newview/skins/default/xui/zh/floater_post_process.xml
deleted file mode 100644
index 2908f7c1d0..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_post_process.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="Post-Process Floater" title="後處理設定：">
-	<tab_container name="Post-Process Tabs">
-		<panel label="顏色過濾" name="wmiColorFilterPanel">
-			<check_box label="啟用" name="wmiColorFilterToggle"/>
-			<text name="wmiColorFilterBrightnessText">
-				亮度
-			</text>
-			<text name="wmiColorFilterSaturationText">
-				飽和度
-			</text>
-			<text name="wmiColorFilterContrastText">
-				對比
-			</text>
-			<text name="wmiColorFilterBaseText">
-				對比基本色
-			</text>
-			<slider label="R" name="wmiColorFilterBaseR"/>
-			<slider label="G" name="wmiColorFilterBaseG"/>
-			<slider label="B" name="wmiColorFilterBaseB"/>
-			<slider label="I" name="wmiColorFilterBaseI"/>
-		</panel>
-		<panel label="夜視" name="wmiNightVisionPanel">
-			<check_box label="啟用" name="wmiNightVisionToggle"/>
-			<text name="wmiNightVisionBrightMultText">
-				光放大倍數
-			</text>
-			<text name="wmiNightVisionNoiseSizeText">
-				噪音規模
-			</text>
-			<text name="wmiNightVisionNoiseStrengthText">
-				噪音強度
-			</text>
-		</panel>
-		<panel label="開花" name="wmiBloomPanel">
-			<check_box label="啟用" name="wmiBloomToggle"/>
-			<text name="wmiBloomExtractText">
-				光度萃取
-			</text>
-			<text name="wmiBloomSizeText">
-				開花大小
-			</text>
-			<text name="wmiBloomStrengthText">
-				開花強度
-			</text>
-		</panel>
-		<panel label="其他" name="Extras">
-			<button label="LoadEffect" label_selected="LoadEffect" name="PPLoadEffect"/>
-			<button label="SaveEffect" label_selected="SaveEffect" name="PPSaveEffect"/>
-			<line_editor label="效果名稱" name="PPEffectNameEditor"/>
-		</panel>
-	</tab_container>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml b/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
deleted file mode 100644
index 0374c74f8f..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_sound_devices.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater name="floater_sound_devices" title="聲音裝置">
-	<text name="voice_label">
-		語音聊天
-	</text>
-	<check_box label="已啟用" name="enable_voice"/>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml b/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
deleted file mode 100644
index aab5fa6028..0000000000
--- a/indra/newview/skins/default/xui/zh/floater_voice_effect.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<floater label="地點" name="voice_effects" title="語音變聲試聽">
-	<string name="no_voice_effect">
-		（無變聲效果）
-	</string>
-	<string name="active_voice_effect">
-		（使用中）
-	</string>
-	<string name="unsubscribed_voice_effect">
-		（已停止訂用）
-	</string>
-	<string name="new_voice_effect">
-		（新的！）
-	</string>
-	<string name="effect_Arena">
-		競技場
-	</string>
-	<string name="effect_Beast">
-		野獸
-	</string>
-	<string name="effect_Buff">
-		Buff
-	</string>
-	<string name="effect_Buzz">
-		Buzz
-	</string>
-	<string name="effect_Camille">
-		卡蜜兒
-	</string>
-	<string name="effect_Creepy">
-		怪異
-	</string>
-	<string name="effect_CreepyBot">
-		怪異機器人
-	</string>
-	<string name="effect_Cyber">
-		科幻
-	</string>
-	<string name="effect_DeepBot">
-		深沉機器人
-	</string>
-	<string name="effect_Demon">
-		魔鬼
-	</string>
-	<string name="effect_Female Elf">
-		女性 - 小精靈
-	</string>
-	<string name="effect_Flirty">
-		調情
-	</string>
-	<string name="effect_Foxy">
-		香豔
-	</string>
-	<string name="effect_Halloween 2010 Bonus">
-		2010萬聖節加贈
-	</string>
-	<string name="effect_Helium">
-		氦氣
-	</string>
-	<string name="effect_Husky">
-		沙啞
-	</string>
-	<string name="effect_Husky Whisper">
-		沙啞耳語
-	</string>
-	<string name="effect_Intercom">
-		對講機
-	</string>
-	<string name="effect_Julia">
-		茱莉亞
-	</string>
-	<string name="effect_Lo Lilt">
-		輕微抑揚頓挫
-	</string>
-	<string name="effect_Macho">
-		陽剛
-	</string>
-	<string name="effect_Micro">
-		Micro
-	</string>
-	<string name="effect_Mini">
-		迷你
-	</string>
-	<string name="effect_Model">
-		模型
-	</string>
-	<string name="effect_Nano">
-		Nano
-	</string>
-	<string name="effect_Nightmare">
-		惡夢
-	</string>
-	<string name="effect_PopBot">
-		PopBot
-	</string>
-	<string name="effect_Rachel">
-		瑞秋
-	</string>
-	<string name="effect_Radio">
-		收音機
-	</string>
-	<string name="effect_Robot">
-		機器人
-	</string>
-	<string name="effect_Roxanne">
-		蘿姍
-	</string>
-	<string name="effect_Rumble">
-		低沉隆隆聲
-	</string>
-	<string name="effect_Sabrina">
-		薩賓娜
-	</string>
-	<string name="effect_Samantha">
-		姍曼莎
-	</string>
-	<string name="effect_Sexy">
-		性感
-	</string>
-	<string name="effect_Shorty">
-		矮個兒
-	</string>
-	<string name="effect_Smaller">
-		較小
-	</string>
-	<string name="effect_Sneaky">
-		鬼祟
-	</string>
-	<string name="effect_Stallion">
-		種馬
-	</string>
-	<string name="effect_Sultry">
-		勾魂
-	</string>
-	<string name="effect_Thunder">
-		雷聲
-	</string>
-	<string name="effect_Vixen">
-		潑婦
-	</string>
-	<string name="effect_WhinyBot">
-		哭鬧機器人
-	</string>
-	<text name="preview_text">
-		預覽
-	</text>
-	<text name="status_text">
-		錄下一段樣本，再點按聲音檢查結果。
-	</text>
-	<button label="錄音" name="record_btn" tool_tip="錄下一段你的聲音。"/>
-	<button label="停止" name="record_stop_btn"/>
-	<text name="voice_morphing_link">
-		[[URL] 現在訂用]
-	</text>
-	<scroll_list name="voice_effect_list" tool_tip="錄下一段你的聲音，再點選一個效果試聽。">
-		<scroll_list.columns label="語音名稱" name="name"/>
-		<scroll_list.columns label="過期" name="expires"/>
-	</scroll_list>
-</floater>
diff --git a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml b/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
deleted file mode 100644
index 6c8a452014..0000000000
--- a/indra/newview/skins/default/xui/zh/panel_voice_effect.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<panel name="panel_voice_effect">
-	<string name="no_voice_effect">
-		關閉變聲效果
-	</string>
-	<string name="preview_voice_effects">
-		預覽變聲效果  ▶
-	</string>
-	<string name="get_voice_effects">
-		取得變聲效果  ▶
-	</string>
-	<combo_box name="voice_effect" tool_tip="選取一個變聲效果來改變你的聲音">
-		<combo_box.item label="關閉變聲效果" name="no_voice_effect"/>
-	</combo_box>
-</panel>