Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

28 files changed, 150 insertions, 158 deletions

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index d1f202b..92ffae7 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -205,5 +205,6 @@
 <ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
 <GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
 <ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
+<ComboBoxBg value="255, 255, 255, 255"/>
  
 </settings>
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
new file mode 100644
index 0000000..f9ea7a2
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
diff --git a/linden/indra/newview/skins/default/textures/uv_test1.bmp b/linden/indra/newview/skins/default/textures/uv_test1.bmp
new file mode 100644
index 0000000..a6ad9bc
--- /dev/null
+++ b/linden/indra/newview/skins/default/textures/uv_test1.bmp
diff --git a/linden/indra/newview/skins/default/xui/da/floater_html.xml b/linden/indra/newview/skins/default/xui/da/floater_html.xml
index 28480f8..5961a0d 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Retur" name="back_btn" />
         <button label="Frem" name="forward_btn" />
         <button label="start" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 7bf1bad..55a9580 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Zurück" name="back_btn" />
         <button label="Weiter" name="forward_btn" />
         <button label="Los" name="go_btn" />
-        <string name="home_page_url">
-                http://de.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://de.secondlife.com/support
-        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 975ae60..4ec46e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -30,30 +30,29 @@
         height="386"
         help_topic="about_credits_tab"
         name="credits_panel">
-
         <text_editor bottom="6" embedded_items="false"
              follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
   max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
   word_wrap="true">
   This meta-impy viewer is based on the Imprudence viewer, and brought to you by Dave and Chris.
-  
+
   http://onefang.net/redmine/ for bug reports, feature requests, bitching, and downloads.
   http://github.com/onefang/meta-impy for the source code.
 
 
   The Imprudence Viewer was rocked hard by:
-  Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave.
+  Armin Weatherwax, Boroondas Gupte, CodeBastard Redgrave, Elektra Hesse, Jacek Antonelli, McCabe Maxsted, and onefang rejected.
 
   http://kokuaviewer.org/
 
   Imprudence is so awesome thanks to contributions from many generous people:
 
-  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen,  Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth,  Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa,  Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr,  Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
+  For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen,  Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth,  Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Johnnie Carling, Lord Drakeo, Kakurady Drakenar, Katharine Berry, Kentron Katana, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa,  Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr,  Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
 
   For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
-  
+
   Thanks also to the developer(s) of the  Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer  for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
-  
+
   For a complete list of who did what, read the release notes!
 
   Many thanks to the many residents in many grids who contributed towards this viewer in countless ways.
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
index e698878..2f9fc4d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
-     width="250" height="225"
+     width="250" height="255"
      name="beacons" title="Beacons"
      rect_control="FloaterBeaconsRect" control_name="BeaconsEnabled">
-        <panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">
+        <panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="240" name="beacons_panel">
         <check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
+        <check_box bottom_delta="-20" follows="left|top" left="0" name="moap" label="MOAP Objects" control_name="moapbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
              bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index 53dd217..5f9e745 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -68,13 +68,34 @@
      label="Values are percent" left_delta="-5" mouse_opaque="true"
      tool_tip="Default settings are Percentages and every axis set at 50"
      name="PivotPercToggle" radio_style="false" width="100" />
-  
-  <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-                                         initial_value="true" label="Show selection outlines" left_delta="143"
-                                         mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+                                         bottom_delta="-50" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+                                         h_pad="0" halign="left" height="10" left="220" mouse_opaque="false"
+                                         name="text_box8" v_pad="0" width="150">Show during build:</text>
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
+     left="198" name="ShowBorder" width="135" />
+
+
+  <check_box bottom_delta="70" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+                                         initial_value="true" label="Hidden selection" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsRenderHidden_toggle" 
                                          radio_style="false" width="270"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Limit Select Distance" left_delta="0" mouse_opaque="true"
+                                         initial_value="true" label="Light radius" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsRenderLightRadius_toggle" 
+                                         radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+                                         initial_value="true" label="Selection beam" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsShowSelectionBeam_toggle" 
+                                         radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+                                         initial_value="true" label="Selection outlines" left_delta="0"
+                                         mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+                                         radio_style="false" width="270"/>
+
+  <check_box bottom_delta="198" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     label="Limit Select Distance" left_delta="148" mouse_opaque="true"
      tooltip=""
      name="limit_select_dist_check" radio_style="false" width="270" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
index 7974d85..c00a86d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_clear_cache.xml
@@ -7,7 +7,7 @@
      font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="20"
      mouse_opaque="true" name="cache_label" v_pad="0" width="185">
 Cache Will Be Cleared After
-You Restart Imprudence
+You Restart meta-impy
   </text>
   <check_box bottom_delta="-37" follows="left|top" font="SansSerifSmall" height="20"
      initial_value="false" label="Clear texture cache" left="10"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
index d107454..76283c3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
@@ -16,10 +16,4 @@
              select_all_on_focus_received="true" width="435" />
         <button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
              label="Go" left_delta="440" name="go_btn" width="70" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 76eee6f..12fe153 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -48,10 +48,4 @@
                              left="-110" name="set_home" width="104" />
                 </layout_panel>
         </layout_stack>
-  <string name="home_page_url">
-    http://www.secondlife.com
-  </string>
-  <string name="support_page_url">
-    http://support.secondlife.com
-  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml b/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml
new file mode 100644
index 0000000..b9e3f99
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MOAP" title="MOAP Radar"
+        can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
+        rect_control="FloaterRadarRect" min_width="700" min_height="150">
+
+        <scroll_list name="moap_list"
+                    left="10" right="-10" top="-20" bottom="40" can_resize="true"
+                    column_padding="0" follows="left|top|bottom|right"
+                    draw_heading="true" multi_select="true" search_column="1"
+                    tool_tip="MOAP List">
+                <column name="URL" label="URL" width="450" tool_tip="URL of MOAP"/>
+                <column name="face" label="Face" width="48" tool_tip="URL of MOAP"/>
+                <column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar"/>
+                <column name="position" label="Pos." width="90" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
+                <column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
+        </scroll_list>
+
+
+                <button
+                           name="open_btn"
+                           label="Open"
+                           tool_tip="Open Current URL"
+                           left="10"
+                           bottom_delta="-30"
+                           width="80"
+                           height="20"
+                           font="SansSerifSmall"
+                           follows="bottom|left"
+                               />
+                <button
+                           name="track_btn"
+                           label="(Un)Track"
+                           tool_tip="Toggle tracking of this MOAPs position"
+                           left_delta="90"
+                           bottom_delta="0"
+                           width="80"
+                           height="20"
+                           font="SansSerifSmall"
+                           follows="bottom|left"
+                               />
+                <button
+                           name="copy_btn"
+                           label="Get URL"
+                           tool_tip="Copies URL to the clipboard"
+                           left_delta="90"
+                           bottom_delta="0"
+                           width="80"
+                           height="20"
+                           font="SansSerifSmall"
+                           follows="bottom|left"
+                               />
+                <!-- upper middle row -->
+        
+</floater>
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 3f476cf..2ed5120 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
@@ -69,20 +69,24 @@
 
         <check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Position" left="4" mouse_opaque="true"
-             name="radio position" radio_style="true" width="114" />
+             name="radio position" radio_style="true" width="114"
+             tool_tip="Position selected prims (Ctrl-Shift-P)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
-             name="radio rotate" radio_style="true" width="114" />
+             name="radio rotate" radio_style="true" width="114"
+             tool_tip="Rotate selected prims (Ctrl)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
-             mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
+             mouse_opaque="true" name="radio stretch" radio_style="true" width="123"
+             tool_tip="Resize selected prims (Ctrl-Shift)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Select faces to texture" left="4" mouse_opaque="true"
-             name="radio select face" radio_style="true" width="114" />
+             name="radio select face" radio_style="true" width="114"
+             tool_tip="Select faces of prims to texture (Ctrl-Alt-F)." />
         <check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
              initial_value="false" label="Align (Shift to Pack)" left="4" mouse_opaque="true"
              name="radio align" radio_style="true" width="114"
-       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
+             tool_tip="Align (Ctrl-Alt-M) aligns all selected prims edges along an axis.  Pack (Ctrl-Alt-Shift-M) moves all selected prims edges so they're touching." />
         <check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
              font="SansSerifSmall" height="16" initial_value="false"
              label="Edit linked parts" left="4" mouse_opaque="true"
@@ -1363,9 +1367,12 @@
         <string name="status_move">
                 Drag to Move, Shift-Drag to Copy
         </string>
-  <string name="status_align">
-    CTRL-A to align on an axis, CTRL-Shift-A to Pack 
-  </string>
+        <string name="status_selectface">
+                Click to select a Face for texturing
+        </string>
+        <string name="status_align">
+                Click to Align, Shift-Click to Pack 
+        </string>
         <string name="status_modifyland">
                 Click and Hold to Modify Land
         </string>
@@ -1379,7 +1386,7 @@
                 Click Inworld to Build
         </string>
         <string name="status_selectland">
-                Click and Drag to Select Land
+                Click and Drag to select Land
         </string>
         <string name="grid_screen_text">
                 Screen
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 0cbd7c6..8295d3a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -166,17 +166,15 @@
                 <on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
         </menu_item_call>
         <menu_item_separator name="Copy Separator" />
-<!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961
-  <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
+        <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
              name="Cut" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
-  </menu_item_call>
--->
-  <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
+            <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
              name="Copy" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
-  </menu_item_call>
-  <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
+            <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
+        </menu_item_call>
+        <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
              name="Paste" width="128">
                 <on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
         </menu_item_call>
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index ffdafe2..9b9a198 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -23,15 +23,15 @@
                         <on_click function="ShowFloater" userdata="help f1" />
                 </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Imprudence Blog"
-                    label="Imprudence Blog">
+    <menu_item_call name="Imprudence communication channels"
+                    label="Imprudence communication channels">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" />
+                userdata="WebLaunchImprudenceComms,http://wiki.kokuaviewer.org/wiki/Communication_Channels" />
     </menu_item_call>
-    <menu_item_call name="Imprudence Forums"
-                    label="Imprudence Forums">
+    <menu_item_call name="Imprudence bug reporting"
+                    label="Imprudence bug reporting">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
+                userdata="WebLaunchImprudenceBugs,http://wiki.kokuaviewer.org/wiki/Reporting_a_bug" />
     </menu_item_call>
     <menu_item_separator />
                 <menu_item_call label="About meta-impy" name="About meta-impy">
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 193592b..125962d 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
@@ -385,6 +385,10 @@
       <on_click function="ShowFloater" userdata="mini map" />
       <on_check control="ShowMiniMap" />
     </menu_item_check>
+        <menu_item_check enabled="true" label="MOAP Radar" name="MOAPRadar" shortcut="">
+                        <on_click function="View.ToggleMOAPList" userdata="moapradar" />
+                        <on_check control="ShowMOAPRadar" />
+                </menu_item_check>
     <menu_item_separator />
     <menu_item_check label="Animation Overrider" name="AO" 
                      shortcut="control|shift|O">
@@ -677,17 +681,17 @@
                   userdata="" />
         <on_check control="RenderLightRadius" />
       </menu_item_check>
-      <menu_item_check label="Show Selection Outlines"
-                       name="Show Selection Outlines">
-        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
-        <on_check control="RenderHighlightSelections" />
-      </menu_item_check>
       <menu_item_check name="Show Selection Beam"
                        label="Show Selection Beam">
         <on_click function="ToggleControl"
                   userdata="ShowSelectionBeam" />
         <on_check control="ShowSelectionBeam" />
       </menu_item_check>
+      <menu_item_check label="Show Selection Outlines"
+                       name="Show Selection Outlines">
+        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
+        <on_check control="RenderHighlightSelections" />
+      </menu_item_check>
     </menu>
     <menu_item_separator />
     <menu_item_check name="Snap to Grid" enabled="false"
@@ -844,15 +848,15 @@
       <on_click function="ShowFloater" userdata="help tutorial" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Imprudence Blog"
-                    label="Imprudence Blog">
+    <menu_item_call name="Imprudence communication channels"
+                    label="Imprudence communication channels">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" />
+                userdata="WebLaunchImprudenceComms,http://wiki.kokuaviewer.org/wiki/Communication_Channels" />
     </menu_item_call>
-    <menu_item_call name="Imprudence Forums"
-                    label="Imprudence Forums">
+    <menu_item_call name="Imprudence bug reporting"
+                    label="Imprudence bug reporting">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" />
+                userdata="WebLaunchImprudenceBugs,http://wiki.kokuaviewer.org/wiki/Reporting_a_bug" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Scripting Portal"
@@ -1323,6 +1327,12 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="sculpt" />
         </menu_item_check>
+        <menu_item_check name="ShadowFrusta" label="Shadow Frusta">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="shadow frusta" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="shadow frusta" />
+        </menu_item_check>
         <menu_item_check name="Vectorize Perf Test"
                          label="Vectorize Perf Test">
           <on_click function="ToggleControl"
@@ -1644,23 +1654,17 @@
       <menu_item_call name="Dump Inventory" label="Dump Inventory">
         <on_click function="Advanced.DumpInventory" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Dump Focus Holder"
-                      label="Dump Focus Holder"
-                      shortcut="control|alt|F">
+      <menu_item_call name="Dump Focus Holder" label="Dump Focus Holder">
         <on_click function="Advanced.DumpFocusHolder" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Print Selected Object Info"
-                      label="Print Selected Object Info"
-                      shortcut="control|shift|P">
+      <menu_item_call name="Print Selected Object Info" label="Print Selected Object Info">
         <on_click function="Advanced.PrintSelectedObjectInfo"
                   userdata="" />
       </menu_item_call>
-      <menu_item_call name="Print Agent Info"
-                      label="Print Agent Info" shortcut="shift|P">
+      <menu_item_call name="Print Agent Info" label="Print Agent Info">
         <on_click function="Advanced.PrintAgentInfo" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Memory Stats" label="Memory Stats"
-                      shortcut="control|alt|shift|M">
+      <menu_item_call name="Memory Stats" label="Memory Stats">
         <on_click function="Advanced.PrintTextureMemoryStats"
                   userdata="" />
       </menu_item_call>
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 5f97d74..a31f609 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7245,11 +7245,11 @@ Show Look At is a debug setting that displays where an avatar's head is looking.
   
 <notification
  icon="alert.tga"
- name="WebLaunchImprudenceBlog"
+ name="WebLaunchImprudenceComms"
  type="alert">
-Go to the Official Imprudence Blog, for the Latest News and Information.
+Go to the Official Imprudence communications channels, to discuss the Imprudence Project.
   <usetemplate
-   ignoretext="When launching web browser to view the blog"
+   ignoretext="When launching web browser to view the communications channels"
    name="okcancelignore"
    notext="Cancel"
    yestext="Go to page"/>
@@ -7257,11 +7257,11 @@ Go to the Official Imprudence Blog, for the Latest News and Information.
 
 <notification
  icon="alert.tga"
- name="WebLaunchImprudenceForums"
+ name="WebLaunchImprudenceBugs"
  type="alert">
-Go to the Official Imprudence Forums to discuss the Imprudence Project.
+Go to the Official Imprudence bug and feature trackers, to report bugs and request new features.
   <usetemplate
-   ignoretext="When launching web browser to view the forums"
+   ignoretext="When launching web browser to view the bug and feature trackers"
    name="okcancelignore"
    notext="Cancel"
    yestext="Go to page"/>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
index 5977fff..8f469b1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Atrás" name="back_btn"/>
         <button label="Adelante" name="forward_btn"/>
         <button label="Ir" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index 1538189..f335617 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -7,10 +7,4 @@
         <button label="Arrêter" name="stop_btn" />
         <button label="Domicile" name="home_btn" />
         <button label="Aller" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_html.xml b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
index 21b6a21..5923c52 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
@@ -5,9 +5,6 @@
         <button label="Kezdő helyszín" name="home_btn" />
         <button label="Előre" name="forward_btn" />
         <button label="Menj" name="go_btn" />
-        <text name="home_page_url">
-                http://www.google.com
-        </text>
         <text name="in-world_help_title">
                 In-World segítség
         </text>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_html.xml b/linden/indra/newview/skins/default/xui/it/floater_html.xml
index 4080f80..b2d1951 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Indietro" name="back_btn"/>
         <button label="Avanti" name="forward_btn"/>
         <button label="Vai" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
index 62aac82..1cb5384 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
@@ -5,10 +5,4 @@
         <button label="ホーム" name="home_btn" />
         <button label="進む" name="forward_btn" />
         <button label="移動" name="go_btn" />
-        <string name="home_page_url">
-                http://jp.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://wiki.secondlife.com/wiki/Knowledge_Base/ja
-        </string>       
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/nl/floater_html.xml b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
index 1604248..0147319 100644
--- a/linden/indra/newview/skins/default/xui/nl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Terug" name="back_btn"/>
         <button label="Vooruit" name="forward_btn"/>
         <button label="Ga" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_html.xml b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
index 90d29e1..645fe80 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
@@ -5,10 +5,4 @@
         <button label="Prześlij dalej" name="forward_btn" width="85"/>
         <line_editor left_delta="100" name="url_edit" width="420" />
         <button label="Idź" name="go_btn" left_delta="425" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
index 3d500dd..aaa49c8 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -4,10 +4,4 @@
         <button label="Voltar" name="back_btn"/>
         <button label="Adiantar" name="forward_btn"/>
         <button label="Ir" name="go_btn"/>
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
-        <string name="support_page_url">
-                http://support.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_html.xml b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
index 4a5942b..6492440 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
@@ -4,7 +4,4 @@
         <button label="Назад" name="back_btn" />
         <button label="Вперед" name="forward_btn" />
         <button label="Перейти" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_html.xml b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
index 8bde260..11a10cf 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
@@ -4,7 +4,4 @@
         <button label="Назад" name="back_btn" />
         <button label="Вперед" name="forward_btn" />
         <button label="Перейти" name="go_btn" />
-        <string name="home_page_url">
-                http://www.secondlife.com
-        </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index ea49e35..9ee9d2f 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3624,24 +3624,6 @@ GLOW —  发光
    name="okignore"
    yestext="OK"/>
 </notification>
-  
-<notification name="WebLaunchImprudenceBlog">
-前往 Imprudence 官方日志阅读最新的新闻和信息。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读网络日志时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
-
-<notification name="WebLaunchImprudenceForums">
-前往 Imprudence 官方论坛讨论 Imprudence 工程。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读论坛时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
 
 <notification
  icon="alert.tga"