SL-13132 Emphasize parcel name over region name in Landmarks and Place Profiles

2 files changed, 78 insertions, 37 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_landmark_info.xml b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
index 13986c4030..dd80f6eac8 100644
--- a/indra/newview/skins/default/xui/en/panel_landmark_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_landmark_info.xml
@@ -95,7 +95,7 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right"
-         height="630"
+         height="654"
          layout="topleft"
          left="0"
          min_height="300"
@@ -112,35 +112,56 @@
              name="logo"
              top="10"
              width="290" />
+            <!-- texture picker has an empty label section, compensate for it with negative top_pad-->
             <text
              follows="left|top|right"
              font="SansSerifLarge"
              height="14"
              layout="topleft"
              left="10"
-             name="region_title"
+             top_pad="-10"
+             width="280"
+             name="parcel_title"
              text_color="white"
-             top_pad="10"
              use_ellipses="true"
-             value="SampleRegion"
-             width="280" />
+             value="SampleParcel, Name Long" />
             <text
              follows="left|top|right"
              height="14"
              layout="topleft"
              left="10"
-             name="parcel_title"
-             top_pad="10"
+             top_pad="9"
+             width="280"
+             name="region_title"
+             use_ellipses="true">
+              Region: [REGIONAMEPOS]
+            </text>
+            <text
+             follows="left|top"
+             height="15"
+             layout="topleft"
+             left="10"
+             name="parcel_owner_label"
+             top_pad="7"
+             value="Owner:"
+             width="80" />
+            <text
+             follows="left|top|right"
+             height="15"
+             layout="topleft"
+             left_pad="0"
+             name="parcel_owner"
+             top_delta="0"
              use_ellipses="true"
-             value="SampleParcel, Name Long (145, 228, 26)"
-             width="280" />
+             value="TempOwner"
+             width="215" />
             <expandable_text
              follows="left|top|right"
              height="50"
              layout="topleft"
              left="10"
              name="description"
-             top_pad="10"
+             top_pad="7"
              value="Du waltz die spritz"
              width="280" />
             <icon
@@ -163,19 +184,38 @@
              width="268" />
             <panel
              follows="left|top|right"
-             height="55"
+             height="81"
              layout="topleft"
              left="10"
              name="landmark_info_panel"
              top_pad="10"
              width="290">
+                <view_border
+                 bevel_style="none"
+                 follows="top|left"
+                 height="0"
+                 layout="topleft"
+                 left="0"
+                 name="lod_tab_border"
+                 top_pad="5"
+                 width="290" />
+                <text
+                 follows="left|top"
+                 height="15"
+                 layout="topleft"
+                 left="0"
+                 name="this_landmark"
+                 top_pad="8"
+                 width="90">
+                  This landmark:
+                </text>
                 <text
                  follows="left|top"
                  height="15"
                  layout="topleft"
                  left="0"
                  name="owner_label"
-                 top_pad="10"
+                 top_pad="8"
                  value="Owner:"
                  width="90" />
                 <text
diff --git a/indra/newview/skins/default/xui/en/panel_place_profile.xml b/indra/newview/skins/default/xui/en/panel_place_profile.xml
index 0dd75b1b55..36b7b0501b 100644
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -200,7 +200,7 @@
         <panel
          bg_alpha_color="DkGray2"
          follows="left|top|right|bottom"
-         height="580"
+         height="597"
          layout="topleft"
          left="0"
          min_height="300"
@@ -277,32 +277,25 @@
              height="14"
              layout="topleft"
              left="10"
-             name="region_title"
-             text_color="white"
              top_pad="5"
+             width="290"
+             name="parcel_title"
+             text_color="white"
              use_ellipses="true"
-             value="SampleRegion"
-             width="290" />
+             value="SampleParcel" />
             <text
              parse_urls="false"
              follows="left|top|right"
              height="14"
              layout="topleft"
              left="10"
-             name="parcel_title"
-             top_pad="4"
-             use_ellipses="true"
-             value="SampleParcel, Name Long (145, 228, 26)"
-             width="285" />
-            <expandable_text
-             follows="left|top"
-             height="50"
-             layout="topleft"
-             left="5"
-             name="description"
-             top_pad="10"
-             value="Du waltz die spritz"
-             width="285" />
+             top_pad="5"
+             width="285"
+             name="region_title"
+             text_color="White"
+             use_ellipses="true">
+              Region: [REGIONAMEPOS]
+            </text>
             <text
              follows="left|top"
              height="14"
@@ -310,20 +303,28 @@
              left="10"
              name="owner_label"
              text_color="White"
-             top_pad="0"
+             top_pad="2"
              value="Owner:"
-             width="90" />
-         <!--TODO: HOOK THIS NAME UP WITH AN INSPECTOR  -->
+             width="80" />
             <text
              follows="left|top|right"
              height="14"
              layout="topleft"
-             left_pad="1"
-             name="owner_value"
+             left_pad="0"
+             name="parcel_owner"
              top_delta="0"
              value="Alex Superduperlongenamenton"
              use_ellipses="true" 
              width="200" />
+            <expandable_text
+             follows="left|top"
+             height="50"
+             layout="topleft"
+             left="5"
+             name="description"
+             top_pad="10"
+             value="Du waltz die spritz"
+             width="285" />
             <icon
              follows="top|left"
              height="16"
@@ -331,7 +332,7 @@
              layout="topleft"
              left="10"
              name="maturity_icon"
-             top_delta="0"
+             top_pad="0"
              width="18" />
             <text
              follows="left|top|right"