17 files changed, 215 insertions, 30 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8c1722a..ab8c1d7 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,38 @@
+2009-09-20 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Dynamically change max prim size depending upon LL/OpenSim grid (added setting for opensim detection: LoggedIntoOpenSim). OpenSim max is 128m.
+        
+                modified:   linden/indra/llmath/xform.h
+                modified:   linden/indra/newview/app_settings/settings
+                modified:   linden/indra/newview/llmanipscale.cpp
+                modified:   linden/indra/newview/llmanipscale.h
+                modified:   linden/indra/newview/llpanelobject.cpp
+                modified:   linden/indra/newview/llviewermessage.cpp
+                modified:   linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+                
+                
+        * Fixed inventory offers not avatar name (another RLVa bug).
+        
+                modified:   linden/indra/newview/llviewermessage.cpp
+                
+                
+        * Fixed group titles showing up as ?.
+        
+                modified:   linden/indra/newview/llvoavatar.cpp
+                
+                
+        * Added adult compliant flag.
+        
+                modified:   linden/indra/newview/llstartup.cpp
+
+
+2009-09-18 McCabe Maxsted  <hakushakukun@gmail.com>
+
+        * Applied patch by Aleric Inglewood for VWR-13996 - avatars using 1.22 completely invisible on first sight.
+        
+                modified:   linden/indra/newview/llspatialpartition.cpp
+                        
+
 2009-09-16 McCabe Maxsted  <hakushakukun@gmail.com>
 
      * Estate and track buttons now disable when they should, tweaked spacing.
@@ -606,6 +641,29 @@
         * Online/Offline notifications now always show in IM windows.
         
                 modified:   linden/indra/newview/llcallingcard.cpp
+        
+        
+        * Audio stream track info displayed in chat instead of notices.
+        
+                modified:   indra/newview/lloverlaybar.cpp
+                
+                
+        * Fixed stream info not updating.
+        
+                modified:   indra/llmedia/llmediaimplgstreamer.cpp
+                
+        
+  Dale Glass  <email@unknown.com>       
+
+        * VWR-12655: Add support for displaying the title of the song.          
+        
+                modified:   indra/llaudio/audioengine.h
+                modified:   indra/llmedia/llmediaimplgstreamer.cpp
+                modified:   indra/llmedia/llmediaimplgstreamer.h
+                modified:   indra/llmedia/llmediaobserver.h
+                modified:   indra/newview/app_settings/settings.xml
+                modified:   indra/newview/lloverlaybar.cpp
+                modified:   indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
 
 
 2009-06-13  McCabe Maxsted  <hakushakukun@gmail.com>
diff --git a/linden/indra/llaudio/audioengine.h b/linden/indra/llaudio/audioengine.h
index d289ba5..579f58f 100644
--- a/linden/indra/llaudio/audioengine.h
+++ b/linden/indra/llaudio/audioengine.h
@@ -182,6 +182,8 @@ public:
         static void assetCallback(LLVFS *vfs, const LLUUID &uuid, LLAssetType::EType type, void *user_data, S32 result_code, LLExtStat ext_status);
 
         friend class LLPipeline; // For debugging
+
+        LLMediaBase * getStreamMedia() { return mInternetStreamMedia; }
 public:
         F32 mMaxWindGain; // Hack.  Public to set before fade in?
 
diff --git a/linden/indra/llmath/xform.h b/linden/indra/llmath/xform.h
index 6f880cb..b41219c 100644
--- a/linden/indra/llmath/xform.h
+++ b/linden/indra/llmath/xform.h
@@ -37,7 +37,7 @@
 
 const F32 MAX_OBJECT_Z          = 4096.f; // should match REGION_HEIGHT_METERS, Pre-havok4: 768.f
 const F32 MIN_OBJECT_Z          = -256.f;
-const F32 DEFAULT_MAX_PRIM_SCALE = 10.f;
+//const F32 DEFAULT_MAX_PRIM_SCALE = 10.f; set in llmanipscale.cpp now
 const F32 MIN_PRIM_SCALE = 0.01f;
 const F32 MAX_PRIM_SCALE = 65536.f;     // something very high but not near FLT_MAX
 
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index d1bab29..a9e0004 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -89,6 +89,7 @@ LLMediaImplGStreamer () :
         mPump ( NULL ),
         mPlaybin ( NULL ),
         mVideoSink ( NULL ),
+        mLastTitle ( "" ),
         mState( GST_STATE_NULL ),
         mPlayThread ( NULL )
 {
@@ -470,6 +471,8 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                         case GST_STATE_PAUSED:
                                 break;
                         case GST_STATE_PLAYING:
+                                //impl->mLastTitle = "";
+
                                 LLMediaEvent event( impl, 100 );
                                 impl->getEventEmitter().update( &LLMediaObserver::onUpdateProgress, event );
                                 // emit an event to say that a media source was loaded
@@ -521,18 +524,28 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                 }
                 case GST_MESSAGE_TAG: 
                 {
-                GstTagList *tag_list;
-                gchar *title;
-                gchar *artist;
-                gst_message_parse_tag(message, &tag_list);
-                gboolean hazTitle = gst_tag_list_get_string(tag_list,
-                        GST_TAG_TITLE, &title);
-                gboolean hazArtist = gst_tag_list_get_string(tag_list,
-                        GST_TAG_ARTIST, &artist);
-                if(hazTitle) 
-                        LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
-                if(hazArtist) 
-                        LL_INFOS("MediaInfo") << "Artist: " << artist << LL_ENDL;
+                        GstTagList *new_tags;
+
+                        gst_message_parse_tag( message, &new_tags );
+
+                        gchar *title;
+
+                        if ( gst_tag_list_get_string(new_tags, GST_TAG_TITLE, &title) )
+                        {
+                                LL_INFOS("MediaInfo") << "Title: " << title << LL_ENDL;
+                                std::string newtitle(title);
+                                gst_tag_list_free(new_tags);
+
+                                if ( newtitle != impl->mLastTitle && newtitle != "" )
+                                {
+                                        impl->mLastTitle = newtitle;
+                                        LLMediaEvent event( impl, impl->mLastTitle );
+                                        impl->getEventEmitter().update( &LLMediaObserver::onMediaTitleChange, event );
+                                }
+
+                                g_free(title);
+                        }
+
                         break;
                 }
                 case GST_MESSAGE_EOS:
@@ -551,10 +564,10 @@ gboolean LLMediaImplGStreamer::bus_callback(GstBus *bus, GstMessage *message, gp
                                 impl->addCommand(LLMediaBase::COMMAND_STOP);
                         }
                         break;
+                }
                 default:
                         /* unhandled message */
                         break;
-                }
         }
         /* we want to be notified again the next time there is a message
          * on the bus, so return true (false means we want to stop watching
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.h b/linden/indra/llmedia/llmediaimplgstreamer.h
index baefdaf..51a8c37 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.h
+++ b/linden/indra/llmedia/llmediaimplgstreamer.h
@@ -127,6 +127,7 @@ class LLMediaImplGStreamer:
                 GMainLoop *mPump; // event pump for this media
                 GstElement *mPlaybin;
                 GstSLVideo *mVideoSink;
+                std::string mLastTitle;
                 GstState mState;
                 GstState getState() const { return mState; }
 
diff --git a/linden/indra/llmedia/llmediaobserver.h b/linden/indra/llmedia/llmediaobserver.h
index e6da4f6..97fed5f 100644
--- a/linden/indra/llmedia/llmediaobserver.h
+++ b/linden/indra/llmedia/llmediaobserver.h
@@ -102,6 +102,7 @@ class LLMediaObserver
                 virtual void onMediaSizeChange( const EventType& event_in ) { }
                 virtual void onMediaContentsChange( const EventType& event_in ) { }
                 virtual void onMediaStatusTextChange( const EventType& event_in ) { }
+                virtual void onMediaTitleChange( const EventType &event_in ) { }
                 virtual void onNavigateBegin( const EventType& event_in ) { }
                 virtual void onNavigateComplete( const EventType& event_in ) { }
                 virtual void onUpdateProgress( const EventType& event_in ) { }
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 7ce7d11..f4d853b 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -4720,6 +4720,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LoggedIntoOpenSim</key>
+    <map>
+      <key>Comment</key>
+      <string>Check whether or not we're in an OpenSimulator (default 0)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>LoginAsGod</key>
     <map>
       <key>Comment</key>
@@ -7524,6 +7535,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>ShowStreamTitle</key>
+    <map>
+      <key>Comment</key>
+      <string>Show the title of the song playing on the parcel's stream</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>ShowTangentBasis</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 10cb0c3..5a67937 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -69,6 +69,8 @@ const F32 SNAP_GUIDE_SCREEN_LENGTH = 0.7f;
 const F32 SELECTED_MANIPULATOR_SCALE = 1.2f;
 const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
 const S32 NUM_MANIPULATORS = 14;
+const F32 DEFAULT_LL_MAX_PRIM_SCALE = 10.f; 
+const F32 DEFAULT_OPENSIM_MAX_PRIM_SCALE = 128.f;
 
 const LLManip::EManipPart MANIPULATOR_IDS[NUM_MANIPULATORS] = 
 {
@@ -173,6 +175,7 @@ LLManipScale::LLManipScale( LLToolComposite* composite )
         mScaledBoxHandleSize( 1.f ),
         mLastMouseX( -1 ),
         mLastMouseY( -1 ),
+        mMaxPrimSize(0.f),
         mSendUpdateOnMouseUp( FALSE ),
         mLastUpdateFlags( 0 ),
         mScaleSnapUnit1(1.f),
@@ -201,6 +204,7 @@ void LLManipScale::render()
         LLGLDepthTest gls_depth(GL_TRUE);
         LLGLEnable gl_blend(GL_BLEND);
         LLGLEnable gls_alpha_test(GL_ALPHA_TEST);
+        mMaxPrimSize = gSavedSettings.getBOOL("LoggedIntoOpenSim") ? DEFAULT_OPENSIM_MAX_PRIM_SCALE : DEFAULT_LL_MAX_PRIM_SCALE;
         
         if( canAffectSelection() )
         {
@@ -952,8 +956,8 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 mInSnapRegime = FALSE;
         }
 
-        F32 max_scale_factor = DEFAULT_MAX_PRIM_SCALE / MIN_PRIM_SCALE;
-        F32 min_scale_factor = MIN_PRIM_SCALE / DEFAULT_MAX_PRIM_SCALE;
+        F32 max_scale_factor = mMaxPrimSize / MIN_PRIM_SCALE;
+        F32 min_scale_factor = MIN_PRIM_SCALE / mMaxPrimSize;
 
         // find max and min scale factors that will make biggest object hit max absolute scale and smallest object hit min absolute scale
         for (LLObjectSelection::iterator iter = mObjectSelection->begin();
@@ -965,7 +969,7 @@ void LLManipScale::dragCorner( S32 x, S32 y )
                 {
                         const LLVector3& scale = selectNode->mSavedScale;
 
-                        F32 cur_max_scale_factor = llmin( DEFAULT_MAX_PRIM_SCALE / scale.mV[VX], DEFAULT_MAX_PRIM_SCALE / scale.mV[VY], DEFAULT_MAX_PRIM_SCALE / scale.mV[VZ] );
+                        F32 cur_max_scale_factor = llmin( mMaxPrimSize / scale.mV[VX], mMaxPrimSize / scale.mV[VY], mMaxPrimSize / scale.mV[VZ] );
                         max_scale_factor = llmin( max_scale_factor, cur_max_scale_factor );
 
                         F32 cur_min_scale_factor = llmax( MIN_PRIM_SCALE / scale.mV[VX], MIN_PRIM_SCALE / scale.mV[VY], MIN_PRIM_SCALE / scale.mV[VZ] );
@@ -1262,7 +1266,7 @@ void LLManipScale::stretchFace( const LLVector3& drag_start_agent, const LLVecto
 
                         F32 denom = axis * dir_local;
                         F32 desired_delta_size  = is_approx_zero(denom) ? 0.f : (delta_local_mag / denom);  // in meters
-                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, DEFAULT_MAX_PRIM_SCALE);
+                        F32 desired_scale               = llclamp(selectNode->mSavedScale.mV[axis_index] + desired_delta_size, MIN_PRIM_SCALE, mMaxPrimSize);
                         // propagate scale constraint back to position offset
                         desired_delta_size              = desired_scale - selectNode->mSavedScale.mV[axis_index]; // propagate constraint back to position
 
@@ -1962,7 +1966,7 @@ F32		LLManipScale::partToMaxScale( S32 part, const LLBBox &bbox ) const
                         max_extent = bbox_extents.mV[i];
                 }
         }
-        max_scale_factor = bbox_extents.magVec() * DEFAULT_MAX_PRIM_SCALE / max_extent;
+        max_scale_factor = bbox_extents.magVec() * mMaxPrimSize / max_extent;
 
         if (getUniform())
         {
@@ -1977,7 +1981,7 @@ F32		LLManipScale::partToMinScale( S32 part, const LLBBox &bbox ) const
 {
         LLVector3 bbox_extents = unitVectorToLocalBBoxExtent( partToUnitVector( part ), bbox );
         bbox_extents.abs();
-        F32 min_extent = DEFAULT_MAX_PRIM_SCALE;
+        F32 min_extent = mMaxPrimSize;
         for (U32 i = VX; i <= VZ; i++)
         {
                 if (bbox_extents.mV[i] > 0.f && bbox_extents.mV[i] < min_extent)
@@ -2052,3 +2056,13 @@ BOOL LLManipScale::canAffectSelection()
         }
         return can_scale;
 }
+
+//static
+F32 LLManipScale::getMaxPrimSize()
+{
+        if (gSavedSettings.getBOOL("LoggedIntoOpenSim"))
+        {
+                return DEFAULT_OPENSIM_MAX_PRIM_SCALE;
+        }
+        return DEFAULT_LL_MAX_PRIM_SCALE;
+}
diff --git a/linden/indra/newview/llmanipscale.h b/linden/indra/newview/llmanipscale.h
index 98d8c63..c60cb69 100644
--- a/linden/indra/newview/llmanipscale.h
+++ b/linden/indra/newview/llmanipscale.h
@@ -88,6 +88,8 @@ public:
         static void             setShowAxes( BOOL b );
         static BOOL             getShowAxes();
 
+        static F32              getMaxPrimSize();
+
 private:
         void                    renderCorners( const LLBBox& local_bbox );
         void                    renderFaces( const LLBBox& local_bbox );
@@ -165,6 +167,7 @@ private:
         F32                             mScaleSnapValue;
         BOOL                    mInSnapRegime;
         F32*                    mManipulatorScales;
+        F32                             mMaxPrimSize;
 };
 
 #endif  // LL_MANIPSCALE_H
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 12c001e..c1a2354 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -41,6 +41,7 @@
 #include "llagent.h"
 #include "llbutton.h"
 #include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llfocusmgr.h"
 #include "llimview.h"
 #include "llmediaremotectrl.h"
@@ -73,6 +74,53 @@ LLOverlayBar *gOverlayBar = NULL;
 
 extern S32 MENU_BAR_HEIGHT;
 
+
+class LLTitleObserver
+        :       public LLMediaObserver
+{
+public:
+        void init(std::string url);
+        /*virtual*/ void onMediaTitleChange(const EventType& event_in);
+private:
+        LLMediaBase* mMediaSource;
+};
+
+static LLTitleObserver sTitleObserver;
+
+static LLRegisterWidget<LLMediaRemoteCtrl> r("media_remote");
+
+void LLTitleObserver::init(std::string url)
+{
+
+        if (!gAudiop)
+        {
+                return;
+        }
+
+        mMediaSource = gAudiop->getStreamMedia(); // LLViewerMedia::getSource();
+
+        if ( mMediaSource )
+        {
+                mMediaSource->addObserver(this);
+        }
+}
+
+//virtual
+void LLTitleObserver::onMediaTitleChange(const EventType& event_in)
+{
+        if ( !gSavedSettings.getBOOL("ShowStreamTitle") )
+        {
+                return;
+        }
+
+        LLChat chat;
+        //TODO: set this in XUI
+        std::string playing_msg = "Playing: " + event_in.getStringValue();
+        chat.mText = playing_msg;
+        LLFloaterChat::addChat(chat, FALSE, FALSE);
+}
+
+
 //
 // Functions
 //
@@ -429,6 +477,7 @@ void LLOverlayBar::toggleMusicPlay(void*)
         //                      if ( gAudiop->isInternetStreamPlaying() == 0 )
                                 {
                                         gAudiop->startInternetStream(parcel->getMusicURL());
+                                        sTitleObserver.init(parcel->getMusicURL());
                                 }
                         }
                 }
diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index dd71a0e..9dcf410 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -631,6 +631,10 @@ void LLPanelObject::getState( )
         }
         else
         {
+                mCtrlScaleX->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleY->setMaxValue(LLManipScale::getMaxPrimSize());
+                mCtrlScaleZ->setMaxValue(LLManipScale::getMaxPrimSize());
+
                 // Only allowed to change these parameters for objects
                 // that you have permissions on AND are not attachments.
                 enabled = root_objectp->permModify();
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 127fca2..cdca5d5 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -563,7 +563,7 @@ void LLSpatialGroup::rebuildGeom()
 
 void LLSpatialPartition::rebuildGeom(LLSpatialGroup* group)
 {
-        if (group->changeLOD())
+        if (!LLPipeline::sSkipUpdate && group->changeLOD())
         {
                 group->mLastUpdateDistance = group->mDistance;
                 group->mLastUpdateViewAngle = group->mViewAngle;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 8d5aa9e..ea08298 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1025,6 +1025,7 @@ bool idle_startup()
                 requested_options.push_back("event_categories");
                 requested_options.push_back("event_notifications");
                 requested_options.push_back("classified_categories");
+                requested_options.push_back("adult_compliant");
                 //requested_options.push_back("inventory-targets");
                 requested_options.push_back("buddy-list");
                 requested_options.push_back("ui-config");
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index e326dac..d5d9324 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1266,7 +1266,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
                 if (gCacheName->getName(info->mFromID, first_name, last_name))
                 {
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
-                        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
+                        if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
                         {
                                 first_name = gRlvHandler.getAnonym(first_name.append(" ").append(last_name));
                                 last_name.clear();
@@ -1287,12 +1287,15 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
         {
                 // *TODO:translate -> [FIRST] [LAST]
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-08 (RLVa-1.0.0e)
-                if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
+                if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(info->mFromID)) )
                 {
                         args["[NAME]"] = gRlvHandler.getAnonym(info->mFromName);
                 }
 // [/RLVa:KB]
-                //args["[NAME]"] = info->mFromName;
+                else
+                {
+                        args["[NAME]"] = info->mFromName;
+                }
                 LLNotifyBox::showXml("UserGiveItem", args,
                                                         &inventory_offer_callback, (void*)info);
         }
@@ -3152,6 +3155,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
         // If the server version has changed, display an info box and offer
         // to display the release notes, unless this is the initial log in.
+        // Also verify we're on an OpenSimulator here.
         if (gLastVersionChannel == version_channel)
         {
                 return;
@@ -3163,6 +3167,15 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
                         "ServerVersionChanged", display_release_notes, NULL);
         }
 
+        if (version_channel.find("OpenSim") != std::string::npos)
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", TRUE);
+        }
+        else
+        {
+                gSavedSettings.setBOOL("LoggedIntoOpenSim", FALSE);
+        }
+
         gLastVersionChannel = version_channel;
 }
 
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 158977e..24272d8 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3261,7 +3261,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 if (title && title->getString() && title->getString()[0] != '\0')
                                 {
                                         line += title->getString();
-                                        LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR);
+                                        //LLStringFn::replace_nonprintable(line,LL_UNKNOWN_CHAR); IMP-136 -- MC
                                         line += "\n";
                                         line += firstname->getString();
                                 }
@@ -3321,7 +3321,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
                                 mNameMute = is_muted;
                                 mNameAppearance = is_appearance;
                                 mTitle = title ? title->getString() : "";
-                                LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR);
+                                //LLStringFn::replace_nonprintable(mTitle,LL_UNKNOWN_CHAR); IMP-136 -- MC
                                 mNameString = utf8str_to_wstring(line);
                                 new_name = TRUE;
                         }
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index bc18f44..a57c568 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -660,15 +660,15 @@
                         </text>
                         <spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
+                             min_val="0.01" mouse_opaque="true" name="Scale X"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
+                             min_val="0.01" mouse_opaque="true" name="Scale Y"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
                              increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-                             max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
+                             min_val="0.01" mouse_opaque="true" name="Scale Z"
                              text_enabled_color="1, 1, 1, 1" width="96" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 92978ab..c960d36 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -15,7 +15,7 @@
                 Streaming Preferences:
         </text>
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-             bottom="-280" drop_shadow_visible="true" enabled="true" follows="left|top"
+             bottom="-300" drop_shadow_visible="true" enabled="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="12" left="10"
              mouse_opaque="true" name="audio_prefs_text" v_pad="0" width="128">
                 Audio Preferences:
@@ -28,6 +28,10 @@
              label="Play Streaming Music When Available (uses more bandwidth)"
              left="142" mouse_opaque="true" name="streaming_music" radio_style="false"
              width="339" />
+  <check_box bottom_delta="-20" control_name="ShowStreamTitle" enabled="true"
+             follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
+             label="Show stream info in chat" left="162" mouse_opaque="true"
+       name="show_stream_title" radio_style="false" width="338" />
         <check_box bottom_delta="-20" control_name="AudioStreamingVideo" enabled="true"
              follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
              label="Play Streaming Media When Available (uses more bandwidth)"