Skip to content
Snippets Groups Projects
Commit f71098a4 authored by Eli Linden's avatar Eli Linden
Browse files

Merge

parents cea0bac8 fadbd33b
No related branches found
No related tags found
No related merge requests found
...@@ -574,13 +574,16 @@ void LLPanelNearByMedia::refreshParcelItems() ...@@ -574,13 +574,16 @@ void LLPanelNearByMedia::refreshParcelItems()
if (NULL != mParcelMediaItem) if (NULL != mParcelMediaItem)
{ {
std::string name, url, tooltip; std::string name, url, tooltip;
getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, ""); if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMedia())
if (name.empty() || name == url)
{ {
tooltip = url; getNameAndUrlHelper(LLViewerParcelMedia::getParcelMedia(), name, url, "");
} if (name.empty() || name == url)
else { {
tooltip = name + " : " + url; tooltip = url;
}
else {
tooltip = name + " : " + url;
}
} }
LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia(); LLViewerMediaImpl *impl = LLViewerParcelMedia::getParcelMedia();
updateListItem(mParcelMediaItem, updateListItem(mParcelMediaItem,
...@@ -617,9 +620,14 @@ void LLPanelNearByMedia::refreshParcelItems() ...@@ -617,9 +620,14 @@ void LLPanelNearByMedia::refreshParcelItems()
{ {
bool is_playing = LLViewerMedia::isParcelAudioPlaying(); bool is_playing = LLViewerMedia::isParcelAudioPlaying();
std::string url;
if (!LLViewerParcelMgr::getInstance()->getAgentParcel()->getObscureMusic())
{
url = LLViewerMedia::getParcelAudioURL();
}
updateListItem(mParcelAudioItem, updateListItem(mParcelAudioItem,
mParcelAudioName, mParcelAudioName,
LLViewerMedia::getParcelAudioURL(), url,
-1, // Proximity after Parcel Media, but closer than anything else -1, // Proximity after Parcel Media, but closer than anything else
(!is_playing), (!is_playing),
is_playing, is_playing,
......
...@@ -126,7 +126,7 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac ...@@ -126,7 +126,7 @@ void LLViewerMediaFocus::setFocusFace(LLPointer<LLViewerObject> objectp, S32 fac
if(face_auto_zoom && ! parcel->getMediaPreventCameraZoom()) if(face_auto_zoom && ! parcel->getMediaPreventCameraZoom())
{ {
// Zoom in on this face // Zoom in on this face
mMediaControls.get()->resetZoomLevel(); mMediaControls.get()->resetZoomLevel(false);
mMediaControls.get()->nextZoomLevel(); mMediaControls.get()->nextZoomLevel();
} }
else else
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<floater <floater
legacy_header_height="18" legacy_header_height="18"
follows="left|top|right" follows="left|top|right"
height="570" height="580"
layout="topleft" layout="topleft"
bg_opaque_image="Window_NoTitle_Foreground" bg_opaque_image="Window_NoTitle_Foreground"
bg_alpha_image="Window_NoTitle_Background" bg_alpha_image="Window_NoTitle_Background"
...@@ -737,7 +737,7 @@ ...@@ -737,7 +737,7 @@
</text> </text>
<tab_container <tab_container
follows="left|top" follows="left|top"
height="400" height="410"
halign="center" halign="center"
left="0" left="0"
name="Object Info Tabs" name="Object Info Tabs"
...@@ -1054,7 +1054,7 @@ even though the user gets a free copy. ...@@ -1054,7 +1054,7 @@ even though the user gets a free copy.
name="perms_build" name="perms_build"
left="0" left="0"
top="241" top="241"
height="120" height="130"
width="278"> width="278">
<text <text
type="string" type="string"
...@@ -1135,7 +1135,7 @@ even though the user gets a free copy. ...@@ -1135,7 +1135,7 @@ even though the user gets a free copy.
left="10" left="10"
name="B:" name="B:"
height="10" height="10"
width="45"> width="80">
B: B:
</text> </text>
<text <text
...@@ -1147,7 +1147,7 @@ even though the user gets a free copy. ...@@ -1147,7 +1147,7 @@ even though the user gets a free copy.
left_pad="0" left_pad="0"
name="O:" name="O:"
height="10" height="10"
width="44"> width="80">
O: O:
</text> </text>
<text <text
...@@ -1159,7 +1159,7 @@ even though the user gets a free copy. ...@@ -1159,7 +1159,7 @@ even though the user gets a free copy.
left_pad="0" left_pad="0"
name="G:" name="G:"
height="10" height="10"
width="43"> width="80">
G: G:
</text> </text>
<text <text
...@@ -1167,11 +1167,12 @@ even though the user gets a free copy. ...@@ -1167,11 +1167,12 @@ even though the user gets a free copy.
text_color="White" text_color="White"
length="1" length="1"
follows="left|top" follows="left|top"
left_pad="0" left="10"
top_pad="2"
layout="topleft" layout="topleft"
name="E:" name="E:"
height="10" height="10"
width="43"> width="80">
E: E:
</text> </text>
<text <text
...@@ -1183,7 +1184,7 @@ even though the user gets a free copy. ...@@ -1183,7 +1184,7 @@ even though the user gets a free copy.
left_pad="0" left_pad="0"
name="N:" name="N:"
height="10" height="10"
width="48"> width="80">
N: N:
</text> </text>
<text <text
...@@ -1195,7 +1196,7 @@ even though the user gets a free copy. ...@@ -1195,7 +1196,7 @@ even though the user gets a free copy.
left_pad="0" left_pad="0"
name="F:" name="F:"
height="10" height="10"
width="50"> width="80">
F: F:
</text> </text>
</panel> </panel>
......
...@@ -5850,7 +5850,8 @@ Are you sure you want to close all IMs? ...@@ -5850,7 +5850,8 @@ Are you sure you want to close all IMs?
<usetemplate <usetemplate
name="okcancelignore" name="okcancelignore"
notext="Cancel" notext="Cancel"
yestext="OK"/> yestext="OK"
ignoretext="Confirm before I close all IMs"/>
</notification> </notification>
<notification icon="notifytip.tga" <notification icon="notifytip.tga"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment