Merge branch 'weekly' into webkit_plugins

Conflicts:
	linden/indra/cmake/GStreamer.cmake

linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to
use system libs, so any improvements that have been made in weekly have
been invane.

	linden/indra/newview/llstartup.cpp

Trivial #include collision. One include added another removed. Fixed.

	linden/indra/newview/lltoolpie.cpp

Collision with RLV, pretty trivial. Fixed.

	linden/indra/newview/viewer_manifest.py

Trivial White space fix collision with commenting out of gstreamer libs. Fixed.

6 files changed, 96 insertions, 13 deletions

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
index 50721ab..82a65b8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_script_ed_panel.xml
@@ -5,7 +5,7 @@
              embedded_items="false" enabled="true" follows="left|top|right|bottom"
              font="Monospace" height="376" ignore_tab="false" left="4"
              max_length="65536" mouse_opaque="true" name="Script Editor" width="492" border_drop_shadow_visible="false" border_visible="false" bevel_style="none" border_style="line" border_thickness="0"
-             word_wrap="true" show_line_numbers="true" spell_check="true">
+             word_wrap="true" show_line_numbers="true">
                 Loading...
         </text_editor>
         <button bottom="-499" enabled="true" follows="right|bottom" font="SansSerif"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
index db36df5..13956e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_teleport_history.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
-                min_width="500" min_height="250" width="500" height="250" name="teleporthistory"
+                min_width="600" min_height="250" width="600" height="250" name="teleporthistory"
                 rect_control="FloaterTeleportHistoryRect" title="Teleport History">
         <tab_container label="TPlistTabs" bottom="40" height="185" left="5" follows="left|top|right|bottom" mouse_opaque="false" name="tplisttabs"
              tab_min_width="50" tab_position="top" width="480" right="-10" bg_opaque_color="0,0,0,0.0">
@@ -39,6 +39,10 @@
                 height="20" label="Show On Map" label_selected="Show On Map"
                 left_delta="100" mouse_opaque="true" name="show_on_map"
                 tool_tip="Center map on this location" width="125" />
+        <button bottom_delta="0" enabled="true" follows="left|bottom" font="SansSerif" halign="center"
+                height="20" label="Clear History"
+                left_delta="135" mouse_opaque="true" name="clear_history"
+                tool_tip="Clear Saved Teleport History" width="125" />
         <button bottom_delta="0" enabled="false" follows="bottom|right" font="SansSerif"
                 height="20" label="Copy SLURL to clipboard" left="-190" name="copy_slurl"
                 tool_tip="Copies current location as SLURL to be used on the web."
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 0cb4a59..3e0a5fa 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
@@ -321,6 +321,12 @@
        mouse_opaque="true" name="prim_count" v_pad="0" width="143">
     Primitives: [COUNT]
   </text>
+  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+     bottom="-168" left="118" drop_shadow_visible="true" follows="left|top"
+     font="SansSerifSmall" h_pad="0" halign="right" height="16"
+     mouse_opaque="true" name="link_num" v_pad="0" width="143">
+    Link number: [NUMBER]
+  </text>
 
 <!-- Sub-tabs -->
 
@@ -1085,7 +1091,7 @@
         Glow:
       </text>
                         <spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" left="180" max_val="1"
+                             increment="0.05" initial_val="0" left="180" max_val="1"
                              min_val="0" mouse_opaque="true" name="glow" width="58" />
                         <check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Full bright" left="180" mouse_opaque="true"
@@ -1202,13 +1208,13 @@
                              mouse_opaque="true" name="tex scale" v_pad="0" width="160">
         Repeats Per Face:
       </text>
-      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+      <spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                              initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                              max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
                         <check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
                              initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
                              name="checkbox flip s" width="70" />
-                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                              initial_val="0" label="Vertical (V):" label_width="90" left="20"
                              max_val="10000" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
                         <check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
@@ -1247,11 +1253,11 @@
                              mouse_opaque="true" name="tex offset" v_pad="0" width="160">
         Offset:
       </text>
-                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
+                        <spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.05"
                              initial_val="0" label="Horizontal (U):" label_width="90" left="20"
                              max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
                         <spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-                             increment="0.1" initial_val="0" label="Vertical (V):" label_width="90"
+                             increment="0.05" initial_val="0" label="Vertical (V):" label_width="90"
                              left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
                              width="160" />
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 66d78bd..c85dd47 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1467,8 +1467,8 @@
 
         <menu_item_check name="Show Debug Messages"
                          label="Show Debug Messages">
-          <on_click function="ToggleControl" userdata="RestrainedLifeDebug" />
-          <on_check control="RestrainedLifeDebug" />
+          <on_click function="ToggleControl" userdata="RestrainedLoveDebug" />
+          <on_check control="RestrainedLoveDebug" />
         </menu_item_check>
 
         <menu_item_separator />
@@ -1515,8 +1515,8 @@
 
       <menu_item_check name="Forbid Give to #RLV" label="Forbid Give to #RLV">
         <on_click function="ToggleControl"
-                  userdata="RestrainedLifeForbidGiveToRLV" />
-        <on_check control="RestrainedLifeForbidGiveToRLV" />
+                  userdata="RestrainedLoveForbidGiveToRLV" />
+        <on_check control="RestrainedLoveForbidGiveToRLV" />
       </menu_item_check>
 
       <menu_item_check name="Show Name Tags" label="Show Name Tags">
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index b439dba..78295d4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -6027,8 +6027,12 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
      index="1"
      name="Decline"
      text="Decline"/>
+    <button 
+      index="2" 
+      name="Profile" 
+      text="Profile"/>
     <button
-     index="2"
+     index="3"
      name="Ignore"
      text="Ignore"/>
   </form>
@@ -6051,7 +6055,11 @@ An object named [OBJECTFROMNAME] owned by (an unknown user) has given you a [OBJ
      name="Decline"
      text="Decline"/>
     <button
-     index="2"
+    index="2"
+    name="Profile"
+    text="Profile"/>
+    <button
+     index="3"
      name="Ignore"
      text="Ignore"/>
   </form>
diff --git a/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml b/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml
new file mode 100755
index 0000000..f82a568
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/rlva_strings.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<rlva_strings>
+
+  <strings>
+    <!-- Primarily used when @showloc restricted -->
+    <string name="hidden_generic">(Hidden)</string>
+    <string name="hidden_parcel">(Hidden parcel)</string>
+    <string name="hidden_region">(Hidden region)</string>
+
+    <!-- Received/sent IMs will be replaced by the matching string when @recvim/sendim restricted -->
+    <string name="blocked_recvim">*** IM blocked by your viewer</string>
+    <string name="blocked_sendim">*** IM blocked by sender's viewer</string>
+
+    <!-- Shown as notifications -->
+    <string name="blocked_viewxxx">Unable to open [TYPE] due to RLV restrictions</string>
+
+    <!-- Sent as "Busy" messages to the remote party -->
+    <string name="blocked_recvim_remote">
+      The Resident you messaged is prevented from reading your instant messages at the moment, please try again later.
+    </string>
+    <string name="blocked_tplure_remote">
+      The Resident you invited is prevented from accepting teleport offers. Please try again later.
+    </string>
+  </strings>
+
+  <!-- Generic names used to replace resident names when @shownames restricted -->
+  <anonyms>
+    <anonym>A resident</anonym>
+    <anonym>This resident</anonym>
+    <anonym>That resident</anonym>
+    <anonym>An individual</anonym>
+    <anonym>This individual</anonym>
+    <anonym>That individual</anonym>
+    <anonym>A person</anonym>
+    <anonym>This person</anonym>
+    <anonym>That person</anonym>
+    <anonym>A stranger</anonym>
+    <anonym>This stranger</anonym>
+    <anonym>That stranger</anonym>
+    <anonym>A being</anonym>
+    <anonym>This being</anonym>
+    <anonym>That being</anonym>
+    <anonym>An agent</anonym>
+    <anonym>This agent</anonym>
+    <anonym>That agent</anonym>
+    <anonym>A soul</anonym>
+    <anonym>This soul</anonym>
+    <anonym>That soul</anonym>
+    <anonym>Somebody</anonym>
+    <anonym>Some people</anonym>
+    <anonym>Someone</anonym>
+    <anonym>Mysterious one</anonym>
+    <anonym>An unknown being</anonym>
+    <anonym>Unidentified one</anonym>
+    <anonym>An unknown person</anonym>
+  </anonyms>
+
+  <behaviour-notifications>
+    <!--
+    <notification behaviour="defaultwear" type="add">Text goes here</notification>
+    <notification behaviour="defaultwear" type="rem">Text goes here</notification>
+    -->
+  </behaviour-notifications>
+
+</rlva_strings>