20 files changed, 147 insertions, 86 deletions

diff --git a/linden/indra/newview/app_settings/keywords.ini b/linden/indra/newview/app_settings/keywords.ini
index 2a911ba..56acf4c 100644
--- a/linden/indra/newview/app_settings/keywords.ini
+++ b/linden/indra/newview/app_settings/keywords.ini
@@ -455,6 +455,7 @@ PARCEL_FLAG_ALLOW_LANDMARK			Used with llGetParcelFlags to find if a parcel allo
 PARCEL_FLAG_ALLOW_TERRAFORM                     Used with llGetParcelFlags to find if a parcel allows anyone to terraform the land
 PARCEL_FLAG_ALLOW_DAMAGE                        Used with llGetParcelFlags to find if a parcel allows damage
 PARCEL_FLAG_ALLOW_CREATE_OBJECTS        Used with llGetParcelFlags to find if a parcel allows anyone to create objects
+PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS  Used with llGetParcelFlags to find if a parcel allows group members or objects to create objects
 PARCEL_FLAG_USE_ACCESS_GROUP            Used with llGetParcelFlags to find if a parcel limits access to a group
 PARCEL_FLAG_USE_ACCESS_LIST                     Used with llGetParcelFlags to find if a parcel limits access to a list of residents
 PARCEL_FLAG_USE_BAN_LIST                        Used with llGetParcelFlags to find if a parcel uses a ban list
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 0f15236..55ff208 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4659,6 +4659,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>MediaDebugLevel</key>
+    <map>
+      <key>Comment</key>
+      <string>How spammy media (GStreamer) debug output should be. (0-4)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>U32</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>MemoryLogFrequency</key>
         <map>
         <key>Comment</key>
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 15ce1a3..b2bfccf 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -75,9 +75,6 @@
 
 #if LL_WINDOWS
         #include "llwindebug.h"
-        #include <direct.h>
-        #include <errno.h>
-        #include <stdlib.h>
 #endif
 
 #if LL_WINDOWS
@@ -320,30 +317,6 @@ std::vector<std::string> gLoginURIs;
 static std::string gHelperURI;
 
 
-void LLAppViewer::gst_plugin_path()
-{
-#ifdef LL_WINDOWS
-        char* buffer;
-
-        // Get the current working directory: 
-        if((buffer = _getcwd(NULL,0)) == NULL)
-        {
-                LL_INFOS("InitInfo") << "_getcwd error" << LL_ENDL;
-        }
-        else
-        {
-                LL_INFOS("InitInfo") << "Imprudence is installed at " << buffer << LL_ENDL;
-                
-                std::string plugin_path = "GST_PLUGIN_PATH=" + std::string(buffer) + "\\lib\\gstreamer-plugins";
-
-                // Place GST_PLUGIN_PATH in the environment settings for imprudence.exe
-                const char* gst_plugin_path = plugin_path.c_str();
-                putenv(gst_plugin_path);
-                LL_INFOS("InitInfo") << "GST_PLUGIN_PATH set to " << getenv("GST_PLUGIN_PATH") << LL_ENDL;
-        }
-#endif //LL_WINDOWS
-}
-
 void idle_afk_check()
 {
         // check idle timers
@@ -643,8 +616,6 @@ bool LLAppViewer::init()
         LL_VERSION_PATCH, 
         LL_VERSION_BUILD );
 
-        gst_plugin_path();
-
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
         //////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llappviewer.h b/linden/indra/newview/llappviewer.h
index 2083a93..58dc835 100644
--- a/linden/indra/newview/llappviewer.h
+++ b/linden/indra/newview/llappviewer.h
@@ -138,8 +138,6 @@ public:
 
 protected:
 
-        void gst_plugin_path(); // Sets GST_PLUGIN_PATH environment variable for GStreamer.
-
         virtual bool initWindow(); // Initialize the viewer's window.
         virtual bool initLogging(); // Initialize log files, logging system, return false on failure.
         virtual void initConsole() {}; // Initialize OS level debugging console.
diff --git a/linden/indra/newview/llcompilequeue.cpp b/linden/indra/newview/llcompilequeue.cpp
index fc2742f..b4f1a22 100644
--- a/linden/indra/newview/llcompilequeue.cpp
+++ b/linden/indra/newview/llcompilequeue.cpp
@@ -59,6 +59,7 @@
 #include "llfloaterchat.h"
 #include "llviewerstats.h"
 #include "lluictrlfactory.h"
+#include "llselectmgr.h"
 
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
@@ -194,7 +195,20 @@ BOOL LLFloaterScriptQueue::start()
 {
         //llinfos << "LLFloaterCompileQueue::start()" << llendl;
         std::string buffer;
-        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), mObjectIDs.count()); // *TODO: Translate
+
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        U32 n_objects = 0;
+        if (gSavedSettings.getBOOL("EditLinkedParts"))
+        {
+                n_objects = selectHandle->getObjectCount();
+        }
+        else
+        {
+                n_objects = selectHandle->getRootObjectCount();
+        }
+
+        buffer = llformat("Starting %s of %d items.", mStartString.c_str(), n_objects); // *TODO: Translate
         
         LLScrollListCtrl* list = getChild<LLScrollListCtrl>("queue output");
         list->addCommentText(buffer);
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 5e4aafc..e058681 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -497,7 +497,7 @@ F32 LLDrawable::updateXform(BOOL undamped)
         F32 dist_squared = 0.f;
         F32 camdist2 = (mDistanceWRTCamera * mDistanceWRTCamera);
 
-        if (damped && mDistanceWRTCamera > 0.0f)
+        if (damped && isVisible())
         {
                 F32 lerp_amt = llclamp(LLCriticalDamp::getInterpolant(OBJECT_DAMPING_TIME_CONSTANT), 0.f, 1.f);
                 LLVector3 new_pos = lerp(old_pos, target_pos, lerp_amt);
@@ -521,11 +521,19 @@ F32 LLDrawable::updateXform(BOOL undamped)
                 {
                         // snap to final position
                         dist_squared = 0.0f;
+                        if (!isRoot())
+                        { //child prim snapping to some position, needs a rebuild
+                                gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
+                        }
                 }
         }
 
         if ((mCurrentScale != target_scale) ||
-                (!isRoot() && (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || !mVObjp->getAngularVelocity().isExactlyZero()))
+                (!isRoot() && 
+                 (dist_squared >= MIN_INTERPOLATE_DISTANCE_SQUARED) || 
+                 !mVObjp->getAngularVelocity().isExactlyZero() ||
+                 target_pos != mXform.getPosition() ||
+                 target_rot != mXform.getRotation()))
         { //child prim moving or scale change requires immediate rebuild
                 gPipeline.markRebuild(this, LLDrawable::REBUILD_POSITION, TRUE);
         }
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp
index bbcfba6..1edfbe6 100644
--- a/linden/indra/newview/llfilepicker.cpp
+++ b/linden/indra/newview/llfilepicker.cpp
@@ -899,12 +899,41 @@ BOOL LLFilePicker::getSaveFile(ESaveFilter filter, const std::string& filename)
 // static
 void LLFilePicker::add_to_selectedfiles(gpointer data, gpointer user_data)
 {
-        LLFilePicker* picker = (LLFilePicker*) user_data;
+        // We need to run g_filename_to_utf8 in the user's locale
+        std::string old_locale(setlocale(LC_ALL, NULL));
+        setlocale(LC_ALL, "");
+
+        LLFilePicker* picker = (LLFilePicker*) user_data;
+        GError *error = NULL;
         gchar* filename_utf8 = g_filename_to_utf8((gchar*)data,
-                                                  -1, NULL, NULL, NULL);
-        picker->mFiles.push_back(std::string(filename_utf8));
-        lldebugs << "ADDED FILE " << filename_utf8 << llendl;
-        g_free(filename_utf8);
+                                                  -1, NULL, NULL, &error);
+        if (error)
+        {
+                // This condition should really be notified to the user, e.g.,
+                // through a message box.  Just logging it is inapropriate.
+                // FIXME.
+                
+                // Ghhhh.  g_filename_display_name is new to glib 2.6, and it
+                // is too new for SL! (Note that the latest glib as of this
+                // writing is 2.22. *sigh*) LL supplied *makeASCII family are
+                // also unsuitable since they allow control characters...
+
+                std::string display_name;
+                for (const gchar *str = (const gchar *)data; *str; str++)
+                {
+                        display_name += (char)((*str >= 0x20 && *str <= 0x7E) ? *str : '?');
+                }
+                llwarns << "g_filename_to_utf8 failed on \"" << display_name << "\": " << error->message << llendl;
+        }
+
+        if (filename_utf8)
+        {
+                picker->mFiles.push_back(std::string(filename_utf8));
+                lldebugs << "ADDED FILE " << filename_utf8 << llendl;
+                g_free(filename_utf8);
+        }
+
+        setlocale(LC_ALL, old_locale.c_str());
 }
 
 // static
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index a626ad3..14f9a10 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -385,7 +385,11 @@ void LLFloaterChat::addChat(const LLChat& chat,
                         text_color = gSavedSettings.getColor("IMChatColor");
                         size = INSTANT_MSG_SIZE;
                 }
-                gConsole->addLine(chat.mText, size, text_color);
+                // We display anything if it's not an IM. If it's an IM, check pref... 
+                if ( !from_instant_message || gSavedSettings.getBOOL("IMInChatHistory") )
+                {
+                        gConsole->addLine(chat.mText, size, text_color);
+                }
         }
 
         if(from_instant_message && gSavedPerAccountSettings.getBOOL("LogChatIM"))
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 7a30b22..a8a3b16 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -70,6 +70,7 @@
 #include "llvosurfacepatch.h"
 #include "llvowlsky.h"
 #include "llrender.h"
+#include "llmediamanager.h"
 
 #ifdef TOGGLE_HACKED_GODLIKE_VIEWER
 BOOL                            gHackGodmode = FALSE;
@@ -429,6 +430,22 @@ bool handleVoiceClientPrefsChanged(const LLSD& newvalue)
         return true;
 }
 
+bool handleMediaDebugLevelChanged(const LLSD& newvalue)
+{
+        LLMediaManager *mgr = LLMediaManager::getInstance();
+        if (mgr)
+        {
+                LLMediaBase *impl = 
+                  mgr->createSourceFromMimeType("http", "audio/mpeg");
+
+                if (impl)
+                {
+                        impl->setDebugLevel( (LLMediaBase::EDebugLevel)newvalue.asInteger() );
+                }
+        }
+        return true;
+}
+
 ////////////////////////////////////////////////////////////////////////////
 
 void settings_setup_listeners()
@@ -556,6 +573,7 @@ void settings_setup_listeners()
         gSavedSettings.getControl("VoiceInputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("VoiceOutputAudioDevice")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));
         gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _1));     
+        gSavedSettings.getControl("MediaDebugLevel")->getSignal()->connect(boost::bind(&handleMediaDebugLevelChanged, _1));     
 }
 
 template <> eControlType get_control_type<U32>(const U32& in, LLSD& out) 
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index e99c838..d8fcdcb 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -496,6 +496,13 @@ void LLViewerMedia::initClass()
                 const LLMIMETypes::LLMIMEInfo& info = it->second;
                 mm->addMimeTypeImplNameMap( mime_type, info.mImpl );
         }
+
+        LLMediaBase *impl = mm->createSourceFromMimeType("http", "audio/mpeg");
+        if (impl)
+        {
+                U32 level = gSavedSettings.getU32("MediaDebugLevel");
+                impl->setDebugLevel( (LLMediaBase::EDebugLevel)level );
+        }
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 31fdcc3..486e4f1 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5963,8 +5963,9 @@ void queue_actions(LLFloaterScriptQueue* q, const std::string& noscriptmsg, cons
 {
         // Apply until an object fails
         QueueObjects func(q);
-        const bool firstonly = true;
-        bool fail = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&func, firstonly);
+        LLSelectMgr *mgr = LLSelectMgr::getInstance();
+        LLObjectSelectionHandle selectHandle = mgr->getSelection();
+        bool fail = selectHandle->applyToObjects(&func);
         if(fail)
         {
                 if ( !func.scripted )
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index b947f95..221de59 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3286,6 +3286,10 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
         msg->getVector3Fast(_PREHASH_SoundData, _PREHASH_Position, pos_local);
         msg->getF32Fast(_PREHASH_SoundData, _PREHASH_Gain, gain);
 
+        //If we have sounds muted, don't even try to load or trigger the sound.
+        if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+                return;
+
         // adjust sound location to true global coords
         LLVector3d      pos_global = from_region_handle(region_handle);
         pos_global.mdV[VX] += pos_local.mV[VX];
@@ -3317,7 +3321,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 
 void process_preload_sound(LLMessageSystem *msg, void **user_data)
 {
-        if (!gAudiop)
+        if (!gAudiop || gSavedSettings.getBOOL("MuteSounds"))
         {
                 return;
         }
@@ -3363,6 +3367,9 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
         msg->getF32Fast(_PREHASH_DataBlock, _PREHASH_Gain, gain);
         msg->getU8Fast(_PREHASH_DataBlock, _PREHASH_Flags, flags);
 
+        if(gSavedSettings.getBOOL("MuteSounds") || gain == 0.0)
+                return;
+
         LLViewerObject *objectp = gObjectList.findObject(object_id);
         if (!objectp)
         {
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index fd2487b..7d70dd2 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3096,69 +3096,62 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 (is_away != mNameAway || is_busy != mNameBusy || is_muted != mNameMute)
                                 || is_appearance != mNameAppearance)
                         {
-                                char line[MAX_STRING];          /* Flawfinder: ignore */
-                                if (!sRenderGroupTitles)
-                                {
-                                        // If all group titles are turned off, stack first name
-                                        // on a line above last name
-                                        strncpy(line, firstname->getString(), MAX_STRING -1 );          /* Flawfinder: ignore */
-                                        line[MAX_STRING -1] = '\0';
-                                        strcat(line, "\n");
-                                }
-                                else if (title && title->getString() && title->getString()[0] != '\0')
+                                std::string line;
+                                if (title && title->getString() && title->getString()[0] != '\0')
                                 {
-                                        strncpy(line, title->getString(), MAX_STRING -1 );              /* Flawfinder: ignore */
-                                        line[MAX_STRING -1] = '\0';
-                                        strcat(line, "\n");             /* Flawfinder: ignore */
-                                        strncat(line, firstname->getString(), MAX_STRING - strlen(line) -1 );           /* Flawfinder: ignore */
+                                        line += title->getString();
+                                        LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR);
+                                        line += "\n";
+                                        line += firstname->getString();
                                 }
                                 else
                                 {
-                                        strncpy(line, firstname->getString(), MAX_STRING -1 );          /* Flawfinder: ignore */
-                                        line[MAX_STRING -1] = '\0';
+                                        line += firstname->getString();
                                 }
 
-                                strcat(line, " ");              /* Flawfinder: ignore */
-                                strncat(line, lastname->getString(), MAX_STRING - strlen(line) -1);             /* Flawfinder: ignore */
+                                line += " ";
+                                line += lastname->getString();
                                 BOOL need_comma = FALSE;
 
                                 if (is_away || is_muted || is_busy)
                                 {
-                                        strcat(line, " (");             /* Flawfinder: ignore */
+                                        line += " (";
                                         if (is_away)
                                         {
-                                                strcat(line, "Away");           /* Flawfinder: ignore */
+                                                line += "Away";
                                                 need_comma = TRUE;
                                         }
                                         if (is_busy)
                                         {
                                                 if (need_comma)
                                                 {
-                                                        strcat(line, ", ");             /* Flawfinder: ignore */
+                                                        line += ", ";
                                                 }
-                                                strcat(line, "Busy");           /* Flawfinder: ignore */
+                                                line += "Busy";
                                                 need_comma = TRUE;
                                         }
                                         if (is_muted)
                                         {
                                                 if (need_comma)
                                                 {
-                                                        strcat(line, ", ");             /* Flawfinder: ignore */
+                                                        line += ", ";
                                                 }
-                                                strcat(line, "Muted");          /* Flawfinder: ignore */
+                                                line += "Muted";
                                                 need_comma = TRUE;
                                         }
-                                        strcat(line,")");               /* Flawfinder: ignore */
+                                        line += ")";
                                 }
                                 if (is_appearance)
                                 {
-                                        strcat(line, "\n(Editing Appearance)");         /* Flawfinder: ignore */
+                                        line += "\n";
+                                        line += "(Editing Appearance)";
                                 }
                                 mNameAway = is_away;
                                 mNameBusy = is_busy;
                                 mNameMute = is_muted;
                                 mNameAppearance = is_appearance;
                                 mTitle = title ? title->getString() : "";
+                                LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR);
                                 mNameString = utf8str_to_wstring(line);
                                 new_name = TRUE;
                         }
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 3523635..e7db166 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2665,6 +2665,18 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render
         LLGLState::checkClientArrays();
         U32 last_type = 0;
         
+        // If we don't do this, we crash something on changing graphics settings
+        // from Medium -> Low, because we unload all the shaders and the 
+        // draw pools aren't aware.  I don't know if this has to be a separate
+        // loop before actual rendering. JC
+        for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
+        {
+                LLDrawPool *poolp = *iter;
+                if (poolp->isFacePool() && hasRenderType(poolp->getType()))
+                {
+                        poolp->prerender();
+                }
+        }
         for (pool_set_t::iterator iter = mPools.begin(); iter != mPools.end(); ++iter)
         {
                 LLDrawPool *poolp = *iter;
diff --git a/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
index eb47fa2..d15d186 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="Streaming-Musik abspielen/unterbrechen" />
         <button name="music_play" tool_tip="Streaming-Musik spielen/unterbrechen" />
-        <button name="music_pause" tool_tip="Streaming-Musik unterbrechen" />
         <button name="music_stop" tool_tip="Streaming-Musik beenden" />
         <icon name="media_icon" tool_tip="Streaming-Musik abspielen/unterbrechen" />
         <button name="media_play" tool_tip="Streaming-Musik abspielen/unterbrechen" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index d3174af..8020e9a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -28,7 +28,7 @@
              width="350" />
         <check_box bottom="-65" control_name="IMInChatHistory" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
-             label="Include IM in Local Chat" left="148" mouse_opaque="true"
+             label="Show IMs with Chat" left="148" mouse_opaque="true"
              name="include_im_in_chat_history" radio_style="false" width="237" />
         <check_box bottom="-85" control_name="IMShowTimestamps" enabled="true" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
diff --git a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
index ff498ba..7b601b4 100644
--- a/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/fr/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="Jouer/pauser le flux musical" />
         <button name="music_play" tool_tip="Jouer/pauser le flux musical" />
-        <button name="music_pause" tool_tip="Pauser le flux musical" />
         <button name="music_stop" tool_tip="Arrêter le flux musical" />
         <icon name="media_icon" tool_tip="Jouer/pauser le flux musical" />
         <button name="media_play" tool_tip="Jouer/pauser le flux musical" />
diff --git a/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
index 7c87dc3..89791a5 100644
--- a/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ja/panel_media_controls.xml
@@ -4,8 +4,6 @@
              tool_tip="ストリーミング・ミュージックの再生/一時停止" />
         <button name="music_play"
              tool_tip="ストリーミング・ミュージックの再生/一時停止" />
-        <button name="music_pause"
-             tool_tip="ストリーミング・ミュージックの一時停止" />
         <button name="music_stop"
              tool_tip="ストリーミング・ミュージックの停止" />
         <icon name="media_icon"
diff --git a/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
index 3b3aa0e..fa5a010 100644
--- a/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
+++ b/linden/indra/newview/skins/default/xui/ko/panel_media_controls.xml
@@ -2,7 +2,6 @@
 <panel name="media_controls">
         <icon name="music_icon" tool_tip="스트리밍 음악 재생/일시 정지" />
         <button name="music_play" tool_tip="스트리밍 음악 재생/일시 정지" />
-        <button name="music_pause" tool_tip="스트리밍 음악 일시 정지" />
         <button name="music_stop" tool_tip="스트리밍 음악 중지" />
         <icon name="media_icon" tool_tip="스트리밍 음악 재생/일시 정지" />
         <button name="media_play" tool_tip="스트리밍 음악 재생/일시 정지" />
diff --git a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
index d62fe09..466db79 100644
--- a/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
+++ b/linden/indra/newview/skins/silver/xui/en-us/panel_media_controls.xml
@@ -4,7 +4,7 @@
      name="media_controls" width="220">
         <icon bottom="-18" enabled="true" follows="left|top" height="14"
              image_name="icn_label_music.tga" label="" left_delta="6" mouse_opaque="true"
-             name="music_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="music_icon" scale_image="true" tool_tip="Play streaming music"
              width="14" />
         <button bottom="-21" enabled="true" follows="left|top" height="20"
           image_overlay="icn_play.tga"
@@ -13,15 +13,7 @@
              image_disabled="flyout_btn_left_disabled.tga"
               label="" left_delta="16"
              mouse_opaque="true" name="music_play" scale_image="true" toggle="false"
-             tool_tip="Play/pause streaming music" width="20" />
-  <button bottom="-21" enabled="false" follows="left|top" height="20"
-             image_overlay="icn_pause.tga"
-             image_unselected="flyout_btn_left.tga"
-             image_selected="flyout_btn_left_selected.tga"
-             image_disabled="flyout_btn_left_disabled.tga"
-             label="" left_delta="0"
-             mouse_opaque="true" name="music_pause" scale_image="true" toggle="false"
-             tool_tip="Pause streaming music" width="20" />
+             tool_tip="Play streaming music" width="20" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_stop.tga"
              image_unselected="flyout_btn_right.tga"
@@ -33,7 +25,7 @@
   <icon bottom="-18" enabled="true" follows="left|top" height="14"
              image_name="icn_label_media.tga"
              label="" left_delta="22" mouse_opaque="true"
-             name="media_icon" scale_image="true" tool_tip="Play/pause streaming music"
+             name="media_icon" scale_image="true" tool_tip="Play/pause streaming media"
              width="17" />
   <button bottom="-21" enabled="true" follows="left|top" height="20"
              image_overlay="icn_play.tga"