Pull in viewer-lion to lock down next release

16 files changed, 203 insertions, 211 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
index 9deb0d2030..05594c2d86 100755
--- a/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_hardware_settings.xml
@@ -155,13 +155,12 @@
      tool_tip="Compresses textures in video memory, allowing for higher resolution textures to be loaded at the cost of some color quality."
      width="315" />
     <slider
-     control_name="TextureMemory"
      decimal_digits="0"
      follows="left|top"
      height="20"
      increment="16"
      initial_value="32"
-     label="Texture Memory (MB):"
+     label="Video Memory (MB):"
      label_width="195"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/floater_places.xml b/indra/newview/skins/default/xui/en/floater_places.xml
index b241e265a9..31dd6d2c64 100755
--- a/indra/newview/skins/default/xui/en/floater_places.xml
+++ b/indra/newview/skins/default/xui/en/floater_places.xml
@@ -2,6 +2,7 @@
 
 <floater
   positioning="cascading"
+  default_tab_group="1"
   legacy_header_height="18"
   can_resize="true"
   height="588"
@@ -16,6 +17,7 @@
   width="333">
     <panel
       top="18"
+      tab_group="1"
       class="panel_places"
       name="main_panel"
       filename="panel_places.xml"
diff --git a/indra/newview/skins/default/xui/en/floater_preview_texture.xml b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
index 137e278ddc..e1e7e1c8c8 100755
--- a/indra/newview/skins/default/xui/en/floater_preview_texture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_texture.xml
@@ -79,30 +79,6 @@
      width="108"
      name="combo_aspect_ratio"
      tool_tip="Preview at a fixed aspect ratio">
-    	<combo_item name="Unconstrained" value="Unconstrained">
-    		Unconstrained
-    	</combo_item>
-   	<combo_item name="1:1" value="1:1" tool_tip="Group insignia or Real World profile">
-		1:1
-	</combo_item>
-	<combo_item name="4:3" value="4:3" tool_tip="[SECOND_LIFE] profile">
-		4:3
-	</combo_item>
-	<combo_item name="10:7" value="10:7" tool_tip="Classifieds and search listings, landmarks">
-		10:7
-	</combo_item>
-	<combo_item name="3:2" value="3:2" tool_tip="About land">
-		3:2
-	</combo_item>
-	<combo_item name="16:10" value="16:10">
-		16:10
-	</combo_item>
-	<combo_item name="16:9" value="16:9" tool_tip="Profile picks">
-		16:9
-	</combo_item>
-	<combo_item name="2:1" value="2:1">
-		2:1
-	</combo_item>
 	</combo_box>
     <button
      follows="right|bottom"
diff --git a/indra/newview/skins/default/xui/en/floater_report_abuse.xml b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
index 9561f67941..24f95950d8 100755
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -203,47 +203,15 @@
         <combo_box.item
          label="Age &gt; Age play"
          name="Age__Age_play"
-         value="31" />
+         value="31" />       
         <combo_box.item
-         label="Age &gt; Adult Resident on Teen Second Life"
-         name="Age__Adult_resident_on_Teen_Second_Life"
-         value="32" />
-        <combo_box.item
-         label="Age &gt; Underage Resident outside of Teen Second Life"
-         name="Age__Underage_resident_outside_of_Teen_Second_Life"
-         value="33" />
-        <combo_box.item
-         label="Assault &gt; Combat sandbox / unsafe area"
-         name="Assault__Combat_sandbox___unsafe_area"
-         value="34" />
-        <combo_box.item
-         label="Assault &gt; Safe area"
+         label="Assault &gt; Shooting, pushing, or shoving another Resident in a Safe Area"
          name="Assault__Safe_area"
-         value="35" />
-        <combo_box.item
-         label="Assault &gt; Weapons testing sandbox"
-         name="Assault__Weapons_testing_sandbox"
-         value="36" />
-        <combo_box.item
-         label="Commerce &gt; Failure to deliver product or service"
-         name="Commerce__Failure_to_deliver_product_or_service"
-         value="38" />
+         value="35" />        
         <combo_box.item
          label="Disclosure &gt; Real world information"
          name="Disclosure__Real_world_information"
-         value="39" />
-        <combo_box.item
-         label="Disclosure &gt; Remotely monitoring chat"
-         name="Disclosure__Remotely_monitoring chat"
-         value="40" />
-        <combo_box.item
-         label="Disclosure &gt; Second Life information/chat/IMs"
-         name="Disclosure__Second_Life_information_chat_IMs"
-         value="41" />
-        <combo_box.item
-         label="Disturbing the peace &gt; Unfair use of region resources"
-         name="Disturbing_the_peace__Unfair_use_of_region_resources"
-         value="42" />
+         value="39" />     
         <combo_box.item
          label="Disturbing the peace &gt; Excessive scripted objects"
          name="Disturbing_the_peace__Excessive_scripted_objects"
@@ -255,51 +223,15 @@
         <combo_box.item
          label="Disturbing the peace &gt; Repetitive spam"
          name="Disturbing_the_peace__Repetitive_spam"
-         value="45" />
-        <combo_box.item
-         label="Disturbing the peace &gt; Unwanted advert spam"
-         name="Disturbing_the_peace__Unwanted_advert_spam"
-         value="46" />
-        <combo_box.item
-         label="Fraud &gt; L$"
-         name="Fraud__L$"
-         value="47" />
-        <combo_box.item
-         label="Fraud &gt; Land"
-         name="Fraud__Land"
-         value="48" />
-        <combo_box.item
-         label="Fraud &gt; Pyramid scheme or chain letter"
-         name="Fraud__Pyramid_scheme_or_chain_letter"
-         value="49" />
+         value="45" />        
         <combo_box.item
-         label="Fraud &gt; US$"
+         label="Fraud &gt; L$ or USD $"
          name="Fraud__US$"
-         value="50" />
+         value="50" />       
         <combo_box.item
-         label="Harassment &gt; Advert farms / visual spam"
-         name="Harassment__Advert_farms___visual_spam"
-         value="51" />
-        <combo_box.item
-         label="Harassment &gt; Defaming individuals or groups"
-         name="Harassment__Defaming_individuals_or_groups"
-         value="52" />
-        <combo_box.item
-         label="Harassment &gt; Impeding movement"
-         name="Harassment__Impeding_movement"
-         value="53" />
-        <combo_box.item
-         label="Harassment &gt; Sexual harassment"
-         name="Harassment__Sexual_harassment"
-         value="54" />
-        <combo_box.item
-         label="Harassment &gt; Solicting/inciting others to violate ToS"
+         label="Harassment &gt; Targeted behavior intended to disrupt"
          name="Harassment__Solicting_inciting_others_to_violate_ToS"
-         value="55" />
-        <combo_box.item
-         label="Harassment &gt; Verbal abuse"
-         name="Harassment__Verbal_abuse"
-         value="56" />
+         value="55" />       
         <combo_box.item
          label="Indecency &gt; Broadly offensive content or conduct"
          name="Indecency__Broadly_offensive_content_or_conduct"
@@ -309,49 +241,21 @@
          name="Indecency__Inappropriate_avatar_name"
          value="59" />
         <combo_box.item
-         label="Indecency &gt; Inappropriate content or conduct in a PG region"
+         label="Indecency &gt; Inappropriate content for conduct for Region Rating"
          name="Indecency__Mature_content_in_PG_region"
-         value="60" />
-        <combo_box.item
-         label="Indecency &gt; Inappropriate content or conduct in a Moderate region"
-         name="Indecency__Inappropriate_content_in_Mature_region"
-         value="69" />
-        <combo_box.item
-         label="Intellectual property infringement &gt; Content Removal"
-         name="Intellectual_property_infringement_Content_Removal"
-         value="66" />
-        <combo_box.item
-         label="Intellectual property infringement &gt; CopyBot or Permissions Exploit"
-         name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"
-         value="37" />
+         value="60" />       
         <combo_box.item
          label="Intolerance"
          name="Intolerance"
-         value="61" />
-        <combo_box.item
-         label="Land &gt; Abuse of sandbox resources"
-         name="Land__Abuse_of_sandbox_resources"
-         value="62" />
+         value="61" />        
         <combo_box.item
-         label="Land &gt; Encroachment &gt; Objects/textures"
+         label="Land &gt; Encroachment &gt; Objects or textures"
          name="Land__Encroachment__Objects_textures"
-         value="63" />
+         value="63" />        
         <combo_box.item
-         label="Land &gt; Encroachment &gt; Particles"
-         name="Land__Encroachment__Particles"
-         value="64" />
-        <combo_box.item
-         label="Land &gt; Encroachment &gt; Trees/plants"
-         name="Land__Encroachment__Trees_plants"
-         value="65" />
-        <combo_box.item
-         label="Wagering/gambling"
+         label="Wagering or Gambling"
          name="Wagering_gambling"
-         value="67" />
-        <combo_box.item
-         label="Other"
-         name="Other"
-         value="68" />
+         value="67" />       
     </combo_box>
     <text
      type="string"
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 8b9733df17..3c28233875 100755
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -150,7 +150,7 @@
 	     parameter="Land" />
 	</button>
     <text
-     height="30"
+     height="20"
      word_wrap="true"
      use_ellipses="true"
      type="string"
@@ -294,24 +294,14 @@
     <check_box
      control_name="ScaleUniform"
      height="19"
-     label=""
+     label="Stretch Both Sides"
      layout="topleft"
      left="143"
      name="checkbox uniform"
      top="48"
-     width="20" />
-    <text
-     height="19"
-     label="Stretch Both Sides"
-     left_delta="20"
-     name="checkbox uniform label"
-     top_delta="2"
-     width="120"
-     layout="topleft"
-     follows="top|left"
-     wrap="true">
-     	Stretch Both Sides
-    </text>
+     label_text.wrap="true"
+     label_text.width="100"
+     width="134" />
     <check_box
      control_name="ScaleStretchTextures"
      height="19"
diff --git a/indra/newview/skins/default/xui/en/menu_login.xml b/indra/newview/skins/default/xui/en/menu_login.xml
index 52c4fb1613..e91eea04d1 100755
--- a/indra/newview/skins/default/xui/en/menu_login.xml
+++ b/indra/newview/skins/default/xui/en/menu_login.xml
@@ -35,14 +35,72 @@
      tear_off="true"
      name="Help">
         <menu_item_call
-         label="[SECOND_LIFE] Help"
-         name="Second Life Help"
+         label="How to..."
+         name="How To"
          shortcut="F1">
             <menu_item_call.on_click
-             function="ShowHelp"
-             parameter="f1_help" />
+             function="Help.ToggleHowTo"
+             parameter="" />
         </menu_item_call>
-        <menu_item_separator />
+        <menu_item_call
+           label="Quickstart"
+           name="Quickstart">
+            <menu_item_call.on_click
+            function="Advanced.ShowURL"
+            parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-Quickstart/ta-p/1087919"/>
+        </menu_item_call>
+		<menu_item_separator/>
+        <menu_item_call
+             label="Knowledge Base"
+             name="Knowledge Base">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+            parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Wiki"
+             name="Wiki">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://wiki.secondlife.com"/>
+        </menu_item_call>
+        <menu_item_call
+             label="Community Forums"
+             name="Community Forums">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/>
+        </menu_item_call>         
+        <menu_item_call
+             label="Support portal"
+             name="Support portal">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="https://support.secondlife.com/"/>         
+        </menu_item_call>
+        <menu_item_separator/>
+        <menu_item_call
+             label="[SECOND_LIFE] News"
+             name="Second Life News">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/>  
+        </menu_item_call>
+        <menu_item_call
+             label="[SECOND_LIFE] Blogs"
+             name="Second Life Blogs">
+             <menu_item_call.on_click
+                 function="Advanced.ShowURL"
+                 parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/>
+        </menu_item_call>
+        <menu_item_separator/>       
+        <menu_item_call
+             label="Report Bug"
+             name="Report Bug">
+                <menu_item_call.on_click
+                 function="Advanced.ReportBug"/>
+            </menu_item_call>
+        <menu_item_separator/>
         <menu_item_call
          label="About [APP_NAME]"
          name="About Second Life">
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 52ab7da515..5c98a98d3d 100755
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -130,17 +130,24 @@
           function="Object.ReportAbuse" />
       <menu_item_call.on_enable
           function="Object.EnableReportAbuse" />
-    </menu_item_call>
+    </menu_item_call>   
     <menu_item_call
-        enabled="false"
-        label="Block"
-        name="Object Mute">
-      <menu_item_call.on_click
+   		  label="Block"        
+          name="Object Mute">
+        <menu_item_call.on_click
           function="Object.Mute" />
-      <menu_item_call.on_enable
+        <menu_item_call.on_visible
           function="Object.EnableMute" />
     </menu_item_call>
     <menu_item_call
+          label="Unblock"   
+          name="Object Unmute">
+        <menu_item_call.on_click
+          function="Object.Mute" />
+        <menu_item_call.on_visible
+          function="Object.EnableUnmute" />
+    </menu_item_call>
+    <menu_item_call
         enabled="false"
         label="Return"
         name="Return...">
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 7e8d2aaf9a..d91b4243b2 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -606,44 +606,59 @@
          label="Sun"
          name="Sun"
          tear_off="true">
-            <menu_item_call
+            <menu_item_check
              label="Sunrise"
              name="Sunrise">
-                <menu_item_call.on_click
+                <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="sunrise" />
-            </menu_item_call>
-            <menu_item_call
+                <menu_item_check.on_check
+                 function="World.EnableEnvSettings" 
+                 parameter="sunrise" />
+            </menu_item_check>
+            <menu_item_check
              label="Midday"
              name="Noon"
              shortcut="control|shift|Y">
-                <menu_item_call.on_click
+                <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="noon" />
-            </menu_item_call>
-            <menu_item_call
+                <menu_item_check.on_check
+                 function="World.EnableEnvSettings" 
+                 parameter="noon" />
+            </menu_item_check>
+            <menu_item_check
              label="Sunset"
              name="Sunset"
              shortcut="control|shift|N">
-                <menu_item_call.on_click
+                <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="sunset" />
-            </menu_item_call>
-            <menu_item_call
+                <menu_item_check.on_check
+                 function="World.EnableEnvSettings" 
+                 parameter="sunset" />
+            </menu_item_check>
+            <menu_item_check
              label="Midnight"
              name="Midnight">
-                <menu_item_call.on_click
+                <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="midnight" />
-            </menu_item_call>
+                <menu_item_check.on_check
+                 function="World.EnableEnvSettings" 
+                 parameter="midnight" />
+            </menu_item_check>
             <menu_item_separator/>
-            <menu_item_call
+            <menu_item_check
              label="Use Region Settings"
              name="Use Region Settings">
-                <menu_item_call.on_click
+                <menu_item_check.on_click
                  function="World.EnvSettings"
                  parameter="region" />
-            </menu_item_call>
+                <menu_item_check.on_check
+                 function="World.EnableEnvSettings" 
+                 parameter="region" />
+            </menu_item_check>
         </menu>
 	    
    
@@ -1542,7 +1557,8 @@
             <menu_item_check
              label="Highlight Transparent"
              name="Highlight Transparent"
-             shortcut="control|alt|T">
+             shortcut="control|alt|T"
+             use_mac_ctrl="true">
                 <menu_item_check.on_check
                  function="View.CheckHighlightTransparent" />
                 <menu_item_check.on_click
@@ -3136,18 +3152,6 @@
                 <menu_item_call.on_click
                  function="Advanced.PrintAgentInfo" />
             </menu_item_call>
-            <menu_item_check
-             label="Region Debug Console"
-             name="Region Debug Console"
-             shortcut="control|shift|`"
-             use_mac_ctrl="true">
-                <menu_item_check.on_check
-                 function="Floater.Visible"
-                 parameter="region_debug_console" />
-                <menu_item_check.on_click
-                 function="Floater.Toggle"
-                 parameter="region_debug_console" />
-            </menu_item_check>
             <menu_item_separator />
 
             <menu_item_check
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index c97af4e9ef..ce34c3f7a1 100755
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7634,7 +7634,7 @@ Are you sure you want to share the following items:
 
 With the following Residents:
 
-[RESIDENTS]
+&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
   <tag>confirm</tag>
 	<usetemplate
      name="okcancelbuttons"
@@ -7654,7 +7654,7 @@ Are you sure you want to share the following items:
 
 With the following Residents:
 
-[RESIDENTS]
+&lt;nolink&gt;[RESIDENTS]&lt;/nolink&gt;
   <tag>confirm</tag>
 	<usetemplate
      name="okcancelbuttons"
@@ -10224,4 +10224,14 @@ Cannot create large prims that intersect other players.  Please re-try when othe
      yestext="OK"/>
   </notification>
   
+  <notification
+   icon="alert.tga"
+   name="ChatHistoryIsBusyAlert"
+   type="alertmodal">
+   Chat history file is busy with previous operation. Please try again in a few minutes or choose chat with another person.
+    <usetemplate
+     name="okbutton"
+     yestext="OK"/>
+  </notification>
+  
 </notifications>
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 308acf0c0c..30239d6d01 100755
--- a/indra/newview/skins/default/xui/en/panel_place_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_place_profile.xml
@@ -220,7 +220,7 @@
             <layout_stack
              border_size="0"
              clip="false"
-             follows="left|top|right"
+             follows="left|top"
              height="50"
              layout="topleft"
              mouse_opaque="false"
@@ -251,10 +251,10 @@
                 </layout_panel>
                 <layout_panel
                  follows="left|right"
-                 height="60"
+                 height="50"
                  layout="topleft"
                  min_height="50"
-                 min_width="60"
+                 min_width="50"
                  mouse_opaque="false"
                  name="for_sale_panel"
                  top="0"
@@ -264,7 +264,7 @@
                      height="50"
                      image_name="ForSale_Badge"
                      layout="topleft"
-                     left="10"
+                     left="0"
                      name="icon_for_sale"
                      top="0"
                      width="50" />
@@ -762,11 +762,19 @@
                          top_pad="5"
                          value="Rating:"
                          width="80" />
+                        <icon
+                         follows="top|left"
+                         height="16"
+                         image_name="Parcel_PG_Dark"
+                         layout="topleft"
+                         left_pad="0"
+                         name="estate_rating_icon"
+                         width="18" />
                         <text
                          follows="left|top|right"
                          height="15"
                          layout="topleft"
-                         left_pad="0"
+                         left_pad="10"
                          name="estate_rating"
                          top_delta="0"
                          width="187" />
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index f169dbb702..7d171490e8 100755
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -27,6 +27,7 @@ background_visible="true"
      label="Filter My Places"
      max_length_chars="300"
      name="Filter"
+     tab_group="1"
      top="3"
      width="303" />
     <tab_container
@@ -39,7 +40,7 @@ background_visible="true"
      tab_min_width="80"
      tab_max_width="157"
      tab_height="30"
-     tab_group="1"
+     tab_group="2"
      tab_position="top"
      top_pad="10"
      width="315" />
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index 78743d26bb..d7ffb73dda 100755
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -47,7 +47,7 @@
   <check_box
       height="16"
       enabled="false"
-      label="Show me in Search results"
+      label="Show my profile info in Search results"
       layout="topleft"
       left="30"
       name="online_searchresults"
diff --git a/indra/newview/skins/default/xui/en/panel_region_debug.xml b/indra/newview/skins/default/xui/en/panel_region_debug.xml
index 81b2281adb..fea5f1b19f 100755
--- a/indra/newview/skins/default/xui/en/panel_region_debug.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_debug.xml
@@ -201,4 +201,14 @@
      tool_tip="Cancel region restart"
      top_delta="0"
      width="150" />
+    <button
+     follows="left|top"
+     height="20"
+     label="Region Debug Console"
+     layout="topleft"
+     left="10"
+     name="region_debug_console_btn"
+     tool_tip="Open Region Debug Console"
+     top_pad="5"
+     width="150" />
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml
index 44c84e69a1..489d286e67 100755
--- a/indra/newview/skins/default/xui/en/panel_region_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_region_general.xml
@@ -94,11 +94,20 @@
      width="80" />
     <check_box
      height="20"
+     label="Block Parcel Fly Over"
+     layout="topleft"
+     left="10"
+     name="block_fly_over_check"
+     tool_tip="Extend access checks upwards to prevent flying over a parcel"
+     top="110"
+     width="90" />
+  <check_box
+     height="20"
      label="Allow Damage"
      layout="topleft"
      left="10"
      name="allow_damage_check"
-     top="110"
+     top="130"
      width="80" />
     <check_box
      height="20"
@@ -106,7 +115,7 @@
      layout="topleft"
      left="10"
      name="restrict_pushobject"
-     top="130"
+     top="150"
      width="80" />
     <check_box
      height="20"
@@ -114,7 +123,7 @@
      layout="topleft"
      left="10"
      name="allow_land_resell_check"
-     top="150"
+     top="170"
      width="80" />
     <check_box
      height="20"
@@ -122,7 +131,7 @@
      layout="topleft"
      left="10"
      name="allow_parcel_changes_check"
-     top="170"
+     top="190"
      width="80" />
     <check_box
      height="20"
@@ -131,7 +140,7 @@
      left="10"
      name="block_parcel_search_check"
      tool_tip="Let people see this region and its parcels in search results"
-     top="190"
+     top="210"
      width="80" />
 	<spinner
      decimal_digits="0"
@@ -145,7 +154,7 @@
      max_val="100"
      min_val="1"
      name="agent_limit_spin"
-     top="240"
+     top="260"
      width="170" />
     <spinner
      follows="left|top"
@@ -158,7 +167,7 @@
      max_val="10"
      min_val="1"
      name="object_bonus_spin"
-     top="260"
+     top="280"
      width="170" />
     <text
      follows="left|top"
@@ -167,7 +176,7 @@
      layout="topleft"
      left="10"
      name="access_text"
-     top="290"
+     top="310"
      width="100">
         Rating:
     </text>
@@ -224,7 +233,7 @@
      layout="topleft"
      left="108"
      name="apply_btn"
-     top="320"
+     top="340"
      width="100"/> 
     <button
      follows="left|top"
diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
index c5b0be0616..26cac06648 100755
--- a/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_teleport_history_item.xml
@@ -47,7 +47,20 @@
      text_color="White"
      top="4"
      value="..."
-     width="330" />
+     width="290" />
+    <text
+     follows="right"
+     height="20"
+     layout="topleft"
+     left_pad="5"
+     right="-20"
+     parse_urls="false"
+     use_ellipses="true"
+     name="timestamp"
+     text_color="White"
+     top="4"
+     value="..."
+     width="45" />
     <button
      follows="right"
      height="20"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 67f75fe1d2..f0ff6d5b88 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2257,6 +2257,7 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale
 	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
 
 	<string name="Open landmarks">Open landmarks</string>
+  <string name="Unconstrained">Unconstrained</string>
 
 	<!-- use value="" because they have preceding spaces -->
 	<string name="no_transfer" value=" (no transfer)" />