Merge

4 files changed, 29 insertions, 19 deletions

diff --git a/indra/newview/llpanelnearbymedia.cpp b/indra/newview/llpanelnearbymedia.cpp
index 75b25b6a40..c02f154dc8 100644
--- a/indra/newview/llpanelnearbymedia.cpp
+++ b/indra/newview/llpanelnearbymedia.cpp
@@ -574,13 +574,16 @@ void LLPanelNearByMedia::refreshParcelItems()
 	if (NULL != mParcelMediaItem)
 	{
 		std::string name, url, tooltip;
-		getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, "");
-		if (name.empty() || name == url)
+		if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMedia())
 		{
-			tooltip = url;
-		}
-		else {
-			tooltip = name + " : " + url;
+			getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, "");
+			if (name.empty() || name == url)
+			{
+				tooltip = url;
+			}
+			else {
+				tooltip = name + " : " + url;
+			}
 		}
 		LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia();
 		updateListItem(mParcelMediaItem,
@@ -617,9 +620,14 @@ void LLPanelNearByMedia::refreshParcelItems()
 	{
 		bool is_playing = LLViewerMedia::isParcelAudioPlaying();
 	
+		std::string url;
+		if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMusic())
+		{
+			url = LLViewerMedia::getParcelAudioURL();
+		}
 		updateListItem(mParcelAudioItem,
 					   mParcelAudioName,
-					   LLViewerMedia::getParcelAudioURL(),
+					   url,
 					   -1, // Proximity after Parcel Media, but closer than anything else
 					   (!is_playing),
 					   is_playing,
diff --git a/indra/newview/llviewermediafocus.cpp b/indra/newview/llviewermediafocus.cpp
index 88e7cfec86..b8179f7fc2 100644
--- a/indra/newview/llviewermediafocus.cpp
+++ b/indra/newview/llviewermediafocus.cpp
@@ -126,7 +126,7 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac
 			if(face_auto_zoom && ! parcel->getMediaPreventCameraZoom())
 			{
 				// Zoom in on this face
-				mMediaControls.get()->resetZoomLevel();
+				mMediaControls.get()->resetZoomLevel(false);
 				mMediaControls.get()->nextZoomLevel();
 			}
 			else
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d989282b9f..4e59a9b1ca 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
 <floater
  legacy_header_height="18"
  follows="left|top|right"
- height="570"
+ height="580"
  layout="topleft"
  bg_opaque_image="Window_NoTitle_Foreground"
  bg_alpha_image="Window_NoTitle_Background"
@@ -737,7 +737,7 @@
     </text>
     <tab_container
      follows="left|top"
-     height="400"
+     height="410"
      halign="center"
      left="0"
      name="Object Info Tabs"
@@ -1054,7 +1054,7 @@ even though the user gets a free copy.
          name="perms_build"
          left="0"
          top="241"
-         height="120"
+         height="130"
          width="278">
             <text
              type="string"
@@ -1135,7 +1135,7 @@ even though the user gets a free copy.
              left="10"
              name="B:"
              height="10"
-             width="45">
+             width="80">
                 B:
             </text>
             <text
@@ -1147,7 +1147,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="O:"
              height="10"
-             width="44">
+             width="80">
                 O:
             </text>
             <text
@@ -1159,7 +1159,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="G:"
              height="10"
-             width="43">
+             width="80">
                 G:
             </text>
             <text
@@ -1167,11 +1167,12 @@ even though the user gets a free copy.
              text_color="White"
              length="1"
              follows="left|top"
-             left_pad="0"
+             left="10"
+             top_pad="2"
              layout="topleft"
              name="E:"
              height="10"
-             width="43">
+             width="80">
                 E:
             </text>
             <text
@@ -1183,7 +1184,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="N:"
              height="10"
-             width="48">
+             width="80">
                 N:
             </text>
             <text
@@ -1195,7 +1196,7 @@ even though the user gets a free copy.
              left_pad="0"
              name="F:"
              height="10"
-             width="50">
+             width="80">
                 F:
             </text>
         </panel>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8f1812830f..9d2c7b8bcc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5850,7 +5850,8 @@ Are you sure you want to close all IMs?
     <usetemplate
      name="okcancelignore"
      notext="Cancel"
-     yestext="OK"/>
+     yestext="OK"
+     ignoretext="Confirm before I close all IMs"/>
   </notification>
 
   <notification icon="notifytip.tga"