From 02a1b5ea083ffd2b56d90a17d29a5bfc864889bb Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Tue, 1 Sep 2009 18:40:07 +0000
Subject: DEV-39252 fix duplicate name= elements in the EN xui. This breaks
 localization, please dont do it.

---
 indra/newview/skins/default/xui/en/floater_preview_gesture.xml | 10 +++++-----
 .../skins/default/xui/en/panel_preferences_advanced.xml        |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
index 90711e3acc..0f6504c875 100644
--- a/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_preview_gesture.xml
@@ -76,7 +76,7 @@
      height="40"
      layout="topleft"
      left_delta="84"
-     name="desc"
+     name="desc2"
      top_delta="-4"
      width="180" />
     
@@ -116,17 +116,17 @@
     <panel
      class="floater_snapshot_capture"
      filename="floater_snapshot_Info.xml"
-     name="snapshot_capture_tab"/> 
+     name="snapshot_capture_panel"/> 
     </accordion_tab>
     <accordion_tab
      min_height="100"
      title="Permissions"
-     name="snapshot_capture_tab"
+     name="snapshot_capture_tab2"
      can_resize="false">
     <panel
      class="floater_snapshot_capture"
      filename="floater_snapshot_Permissions.xml"
-     name="snapshot_capture_tab"/> 
+     name="snapshot_capture_panel2"/> 
     </accordion_tab>
     </accordion>
     <!--check_box
@@ -164,7 +164,7 @@
      label="Cancel (not working)"
      layout="topleft"
      left_pad="5"
-     name="save_btn"
+     name="cancel_btn"
      top_delta="0"
      width="80" />   
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 060d84b2e4..88bf3d3b22 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -120,7 +120,7 @@
      height="10"
      left="30"
      text_color="EmphasisColor"
-     name="text_box1"
+     name="heading1"
      top_pad="30"
      width="270">
 Camera:
@@ -166,7 +166,7 @@ Camera:
      length="1"
      height="10"
      left="30"
-     name="text_box1"
+     name="heading2"
      width="270">
 Automatic positioning for:
 	</text>
@@ -194,7 +194,7 @@ Automatic positioning for:
      height="10"
      left="30"
      text_color="EmphasisColor"
-     name="text_box1"
+     name="heading3"
      top_pad="30"
      width="270">
 My Avatar:
-- 
cgit v1.2.3


From 1a5cb4fbfb718a6740bdee0442efbb3ae2897b9b Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 2 Sep 2009 02:01:55 +0000
Subject: Made floater_media_browser.xml a single instance.

---
 indra/newview/skins/default/xui/en/floater_media_browser.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml
index afc72a78a9..28b8139bfd 100644
--- a/indra/newview/skins/default/xui/en/floater_media_browser.xml
+++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml
@@ -7,6 +7,7 @@
  min_width="467"
  name="floater_about"
  save_rect="true"
+ single_instance="true"
  title="Media Browser"
  width="820">
     <floater.string
-- 
cgit v1.2.3


From 5612f13dc8693d89cb5c89f8b1a15115742fba8d Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Wed, 2 Sep 2009 02:59:07 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1516
 https://svn.aws.productengine.com/secondlife/pe/stable-2@1526 ->
 viewer-2.0.0-3 * Bugs: EXT-622 EXT-702 EXT-626 EXT-638 EXT-600 EXT-543
 EXT-656 EXT-801 * New Dev: EXT-282 EXT-782 EXT-694 EXT-797 EXT-798 EXT-799
 EXT-453

---
 .../skins/default/textures/places_rating_adult.tga | Bin 0 -> 648 bytes
 .../default/textures/places_rating_mature.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/places_rating_pg.tga    | Bin 0 -> 1068 bytes
 .../skins/default/xui/en/floater_activeim.xml      |   7 ++-
 .../skins/default/xui/en/floater_sys_well.xml      |  52 +++++++++++------
 .../skins/default/xui/en/panel_activeim_row.xml    |  64 +++++++++++----------
 .../skins/default/xui/en/panel_bottomtray.xml      |  36 +-----------
 .../default/xui/en/panel_group_info_sidetray.xml   |   1 +
 .../newview/skins/default/xui/en/panel_people.xml  |  20 +------
 indra/newview/skins/default/xui/en/panel_picks.xml |   4 +-
 .../skins/default/xui/en/panel_profile_view.xml    |   8 +++
 .../newview/skins/default/xui/en/widgets/list.xml  |   9 +++
 12 files changed, 95 insertions(+), 106 deletions(-)
 create mode 100644 indra/newview/skins/default/textures/places_rating_adult.tga
 create mode 100644 indra/newview/skins/default/textures/places_rating_mature.tga
 create mode 100644 indra/newview/skins/default/textures/places_rating_pg.tga
 create mode 100644 indra/newview/skins/default/xui/en/widgets/list.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/places_rating_adult.tga b/indra/newview/skins/default/textures/places_rating_adult.tga
new file mode 100644
index 0000000000..c344fb1e78
Binary files /dev/null and b/indra/newview/skins/default/textures/places_rating_adult.tga differ
diff --git a/indra/newview/skins/default/textures/places_rating_mature.tga b/indra/newview/skins/default/textures/places_rating_mature.tga
new file mode 100644
index 0000000000..61c879bc92
Binary files /dev/null and b/indra/newview/skins/default/textures/places_rating_mature.tga differ
diff --git a/indra/newview/skins/default/textures/places_rating_pg.tga b/indra/newview/skins/default/textures/places_rating_pg.tga
new file mode 100644
index 0000000000..7805dbce60
Binary files /dev/null and b/indra/newview/skins/default/textures/places_rating_pg.tga differ
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml
index 38c6d44fdf..0af4e1db54 100644
--- a/indra/newview/skins/default/xui/en/floater_activeim.xml
+++ b/indra/newview/skins/default/xui/en/floater_activeim.xml
@@ -5,7 +5,7 @@
 	top="26"
 	left="0"
 	height="22"
-	width="350"
+	width="320"
 	follows="right|bottom"
 	background_visible="true"
 	can_close="true"
@@ -18,13 +18,14 @@
 		layout="topleft"
 		top="20"
 		left="1"
-		width="349"
+		width="320"
 		height="2"
 		name="panel_list_container">
 		<scrolling_panel_list
 			follows="left|right"
 			layout="topleft"
+      left="1"      
 			name="chiclet_row_panel_list"
-			width="335"/>
+			width="318"/>
 	</scroll_container>
 </floater>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/floater_sys_well.xml b/indra/newview/skins/default/xui/en/floater_sys_well.xml
index 46c8960fbd..d76ea398d5 100644
--- a/indra/newview/skins/default/xui/en/floater_sys_well.xml
+++ b/indra/newview/skins/default/xui/en/floater_sys_well.xml
@@ -4,16 +4,16 @@
  background_visible="true" 
  bevel_style="in"
  bg_alpha_color="0.0 0.0 0.0 0.0"
- height="30"
  left="0"
  top="0" 
  follows="right|bottom"
  layout="topleft"
  name="notification_chiclet"
  save_rect="true"
- title="NOTIFICATIONS"
+ title="NOTIFICATIONS" 
  width="320"
  min_width="320"
+ height="60"
  can_minimize="false"
  can_tear_off="false"
  can_resize="false"
@@ -21,20 +21,36 @@
  can_close="false"
  can_dock="true"
 >
-  <scroll_container
-   follows="top|bottom"
-   layout="topleft"
-   name="notification_list_container"
-   left="0"
-   top="18"
-   width="320"
-   height="12">
-    <scrolling_panel_list
-     layout="topleft"
-     name="notification_list"
-     left="1"
-     top="0"
-     height="10"
-     width="318" />
-  </scroll_container>
+	<scroll_container
+	follows="top|bottom"
+	layout="topleft"
+	name="notification_list_container"
+	left="0"
+	top="18"
+	width="320"
+	height="42">
+	<panel
+		layout="topleft"
+		name="twin_list_panel"
+		left="1"
+		top="0"
+		width="318"
+    height="32"
+    bg_alpha_color="1.0 1.0 1.0 1.0">
+		<scrolling_panel_list
+			layout="topleft"
+			name="notification_list"
+			left="1"
+			top="0"
+			height="0"
+			width="318"/>
+		<scrolling_panel_list
+			layout="topleft"
+			name="im_row_panel_list"
+			left="1"
+			top="2"
+			height="0"
+			width="318"/>
+	</panel>
+</scroll_container>
 </floater>
diff --git a/indra/newview/skins/default/xui/en/panel_activeim_row.xml b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
index 8977f30a51..f5af8e7b30 100644
--- a/indra/newview/skins/default/xui/en/panel_activeim_row.xml
+++ b/indra/newview/skins/default/xui/en/panel_activeim_row.xml
@@ -1,47 +1,53 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
-	follows="bottom|right"
+<panel	
 	name="panel_activeim_row"
 	layout="topleft"
+	follows="left|right"
 	top="0"
 	left="0"
-	height="40"
-	width="332"
+	height="35"
+	width="318"
 	background_visible="true"
 	bevel_style="in"
 	bg_alpha_color="0 0 0 0">
-	<chiclet_im
+  <chiclet_im_p2p
 		name="chiclet"
 		layout="topleft"
-		top="4"
-		left="10"
-		height="26"
+		follows="left"
+		top="5"
+		left="5"
+		height="25"
 		width="45">
-	</chiclet_im>
+  </chiclet_im_p2p>
 	<text
 		type="string"
 		name="contact_name"
 		layout="topleft"
 		top="8"
-		left="70"
-		height="20"
-		width="230"
+		left_pad="6"
+		height="28"
+		width="235"
 		length="1"
-		follows="left|top|right|bottom"
-		font="SansSerifBigBold"
-		text_color="White">Contact Name</text>
-	<button
-		name="hide_btn"
-		layout="topleft"
-		top="10"
-		left="310"
-		height="20"
-		width="20"
-		label=""
-		image_unselected="toast_hide_btn.tga"
-		image_disabled="toast_hide_btn.tga"
-		image_selected="toast_hide_btn.tga"
-		image_hover_selected="toast_hide_btn.tga"
-		image_disabled_selected="toast_hide_btn.tga">
-	</button>
+		follows="right|left"
+		font="SansSerifBold"
+		text_color="White">
+    Contact Name
+  </text>
+  <button
+    top="5"
+    left_pad="5"
+    width="15"
+    height="15"
+    layout="topleft"
+    follows="right"
+    name="hide_btn"
+    mouse_opaque="true"
+    label=""
+    tab_stop="false"
+    image_unselected="toast_hide_btn.tga"
+    image_disabled="toast_hide_btn.tga"
+    image_selected="toast_hide_btn.tga"
+    image_hover_selected="toast_hide_btn.tga"
+    image_disabled_selected="toast_hide_btn.tga"
+  />
 </panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index b6d0678cfb..8fc029bea6 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -216,41 +216,7 @@
          left="0"
          top="0"
          width="5"/>
-        <layout_panel
-         auto_resize="false"
-         follows="right"
-         height="28"
-         layout="topleft"
-         min_height="28"
-         name="im_well_panel"
-         width="40"
-         top="0"
-         min_width="40" 
-         user_resize="false">
-            <chiclet_notification
-             follows="right"
-             height="25"
-             layout="topleft"
-             left="0"
-             name="im_well"
-             top="2"
-             width="40">
-              <button
-               image_selected="im_notifications.tga"
-               image_unselected="im_notifications.tga"/>
-              <unread_notifications
-               width="20"
-               height="20"
-               left="18"
-               top="23"/>
-<!-- 
-			  <chiclet_notification.commit_callback
-				 function="Notification.Show"
-				 parameter="ClickUnimplemented" />
- -->               				 
-			</chiclet_notification>
-        </layout_panel>
-        <icon
+      <icon
          auto_resize="false"
          color="0 0 0 0"
          follows="left|right"
diff --git a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
index 2de41a9ee6..6ba4d13117 100644
--- a/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
@@ -69,6 +69,7 @@
      left_delta="0"
      name="founder_name"
      top_pad="10"
+     use_ellipses="true"
      width="140" />
     <button
      top="632"
diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml
index 22823ea98b..e5a417e3d0 100644
--- a/indra/newview/skins/default/xui/en/panel_people.xml
+++ b/indra/newview/skins/default/xui/en/panel_people.xml
@@ -130,24 +130,15 @@
                  min_height="100"
                  name="tab_online"
                  title="Online">
-                    <panel
-                     follows="all"
-                     height="150"
-                     layout="topleft"
-                     left="0"
-                     name="tab_online_panel"
-                     top="100"
-                     width="285">
                         <avatar_list
                          draw_heading="false"
                          follows="all"
-                         height="145"
+                         height="150"
                          layout="topleft"
                          left="0"
                          name="avatars_online"
                          top="0"
                          width="285" />
-                    </panel>
                 </accordion_tab>
                 <accordion_tab
                  can_resize="false"
@@ -155,14 +146,6 @@
                  min_height="100"
                  name="tab_all"
                  title="All">
-                    <panel
-                     follows="all"
-                     height="260"
-                     layout="topleft"
-                     left="0"
-                     name="tab_all_panel"
-                     top="100"
-                     width="285">
                         <avatar_list
                          draw_heading="false"
                          follows="all"
@@ -172,7 +155,6 @@
                          name="avatars_all"
                          top="0"
                          width="285" />
-                    </panel>
                 </accordion_tab>
             </accordion>
             <panel
diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml
index ff161cc2ab..c56bb32feb 100644
--- a/indra/newview/skins/default/xui/en/panel_picks.xml
+++ b/indra/newview/skins/default/xui/en/panel_picks.xml
@@ -28,11 +28,11 @@
          opaque="true"
          top="0"
          width="284">
-            <panel
+            <list
              height="115"
              layout="topleft"
              left="0"
-             name="back_panel"
+             name="picks_list"
              top="0"
              width="284" />
         </scroll_container>
diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml
index 32223d542d..9aa2c304f2 100644
--- a/indra/newview/skins/default/xui/en/panel_profile_view.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml
@@ -8,6 +8,14 @@
  min_width="240"
  name="panel_target_profile"
  width="305">
+    <string
+     name="status_online">
+        Online
+    </string>
+    <string
+     name="status_offline">
+        Offline
+    </string>
     <text
      follows="top|left|right"
      font="SansSerifHugeBold"
diff --git a/indra/newview/skins/default/xui/en/widgets/list.xml b/indra/newview/skins/default/xui/en/widgets/list.xml
new file mode 100644
index 0000000000..8c264205d5
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/list.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<list
+ allow_select="true"
+ bg_opaque_color="PanelFocusBackgroundColor"
+ bg_alpha_color="PanelDefaultBackgroundColor"
+ background_visible="false"
+ background_opaque="false"
+ item_pad="5"
+ multi_select="false" />
\ No newline at end of file
-- 
cgit v1.2.3


From 1f881a743a41e917d58c6dc425f3f7903194e3d7 Mon Sep 17 00:00:00 2001
From: Kurt Stauffacher <kurt@lindenlab.com>
Date: Wed, 2 Sep 2009 18:09:50 +0000
Subject: Update XUI for Me Pick Info and Me Edit Edit Pick Info panels in
 sidetray to match updated style guide.  EXT-805

---
 .../skins/default/xui/en/panel_edit_pick.xml       | 134 +++++++++++----------
 .../skins/default/xui/en/panel_pick_info.xml       | 114 +++++++-----------
 2 files changed, 111 insertions(+), 137 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/panel_edit_pick.xml b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
index 291803fbc5..5dd03656c6 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_pick.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_pick.xml
@@ -9,6 +9,30 @@
  name="panel_edit_pick"
  top="0"
  width="255">
+   <text
+     type="string"
+     length="1"
+     follows="top"
+     font="SansSerifHugeBold"
+     height="15"
+     layout="topleft"
+     left="10"
+     name="title"
+     text_color="white"
+     top="5"
+     width="250">
+        Edit Pick
+    </text>
+   <button
+     follows="top|right"
+     height="20"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back_btn"
+     picture_style="true"
+     right="-20"
+     top="7"
+     width="20" />
    <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
@@ -27,64 +51,42 @@
      left="0"
      width="240"
      height="575">
-    <text
-     type="string"
-     length="1"
-     follows="top"
-     font="SansSerifHugeBold"
-     height="15"
-     layout="topleft"
-     left="10"
-     name="title"
-     text_color="white"
-     top="17"
-     width="250">
-        Edit Pick
-    </text>
     <panel
      background_visible="true"
      bg_alpha_color="DkGray2"
-     width="280"
+     width="220"
      follows="left|right|top|bottom"
      height="560"
      layout="topleft"
+     left="0"
+     top="0">
+    <texture_picker
+     follows="left|top|right"
+     height="190"
+     width="220"
+     layout="topleft"
+     top="20"
      left="10"
-     right="-10"
-     top_pad="5">
-        <panel
-         follows="left|top|right"
-         height="150"
-         layout="topleft"
-         left="10"
-         right="-10"
-         top="10">
-            <panel
-             follows="left|top|right"
-             height="150"
-             layout="topleft" >
-                <texture_picker
-                 follows="left|top|right"
-                 height="150"
-                 layout="topleft"
-                 name="pick_snapshot" />
-            </panel>
-            <icon
-             height="16"
-             image_name="image_edit_icon.tga"
-             layout="topleft"
-             name="edit_icon"
-             right="-25"
-             top="30"
-             visible="false"
-             width="16" />
-        </panel>
+     name="pick_snapshot" />
+     <icon
+     height="16"
+     image_name="image_edit_icon.tga"
+     layout="topleft"
+     name="edit_icon"
+     left="245"
+     top="35"
+     visible="true"
+     width="16" />
         <text
          type="string"
          length="1"
          follows="left|top"
-         height="16"
+         height="15"
+         font="SansSerifSmall"
+         font.style="BOLD"
          layout="topleft"
          left="10"
+         top="215"
          name="Name:"
          text_color="white">
             Name:
@@ -95,46 +97,49 @@
          height="20"
          layout="topleft"
          left="10"
+         top_pad="2"
          max_length="63"
          name="pick_name"
-         right="-10"
          text_color="black"
-         width="255" />
+         width="220" />
         <text
          type="string"
          length="1"
          follows="left|top"
-         height="30"
+         height="15"
+         font="SansSerifSmall"
+         font.style="BOLD"
          layout="topleft"
          left="10"
+         top_pad="20"
          name="description_label"
-         text_color="white"
-         v_pad="15"
-         valign="center">
+         text_color="white">
             Description:
         </text>
         <text_editor
          follows="left|top|right"
          height="100"
+         width="220"
          hide_scrollbar="true"
          layout="topleft"
          left="10"
+         top_pad="2"
          max_length="1023"
          name="pick_desc"
          text_color="black"
-         right="-10"
          word_wrap="true" />
         <text
          type="string"
          length="1"
+         font="SansSerifSmall"
+         font.style="BOLD"
          follows="left|top"
-         height="20"
+         height="15"
          layout="topleft"
          left="10"
          name="location_label"
          text_color="white"
-         v_pad="15"
-         valign="bottom">
+         top_pad="20">
             Location:
         </text>
         <text
@@ -146,10 +151,9 @@
          left="10"
          name="pick_location"
          right="-10"
+         top_pad="2"
          text_color="white"
-         v_pad="10"
          width="250"
-         valign="center"
          word_wrap="true">
             loading...
         </text>
@@ -166,7 +170,7 @@
     </scroll_container>
     <panel
      follows="left|right|bottom"
-     height="25"
+     height="30"
      label="bottom_panel"
      layout="topleft"
      left="10"
@@ -174,21 +178,21 @@
      top_pad="2">
         <button
          follows="bottom|left"
-         height="20"
+         height="25"
          label="Save [WHAT]"
          layout="topleft"
          name="save_changes_btn"
-         right="-120"
-         top="5"
+         left="0"
+         top="0"
          width="130" />
         <button
          follows="bottom|left"
-         height="20"
+         height="25"
          label="Cancel"
          layout="topleft"
          name="cancel_btn"
-         right="-10"
-         top="5"
-         width="90" />
+         left_pad="5"
+         top_delta="0"
+         width="130" />
     </panel>
 </panel>
diff --git a/indra/newview/skins/default/xui/en/panel_pick_info.xml b/indra/newview/skins/default/xui/en/panel_pick_info.xml
index 80fa99c257..c330116702 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_info.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_info.xml
@@ -8,24 +8,6 @@
  name="panel_pick_info"
  top="0"
  width="255">
-   <scroll_container
-     color="DkGray2"
-     follows="left|top|right|bottom"
-     height="300"
-     layout="topleft"
-     left="0"
-     name="profile_scroll"
-     reserve_scroll_corner="true"
-     opaque="true"
-     width="255">
-    <panel
-     name="scroll_content_panel"
-     follows="left|top|right"
-     layout="topleft"
-     top="0"
-     left="0"
-     width="240"
-     height="575">
     <text
      follows="top"
      font="SansSerifHugeBold"
@@ -47,6 +29,24 @@
      right="-20"
      top="7"
      width="20" />
+    <scroll_container
+     color="DkGray2"
+     follows="left|top|right|bottom"
+     height="300"
+     layout="topleft"
+     left="0"
+     name="profile_scroll"
+     reserve_scroll_corner="true"
+     opaque="true"
+     width="255">
+    <panel
+     name="scroll_content_panel"
+     follows="left|top|right"
+     layout="topleft"
+     top="0"
+     left="0"
+     width="240"
+     height="575">
     <panel
      background_visible="true"
      bg_alpha_color="DkGray2"
@@ -55,80 +55,51 @@
      layout="topleft"
      left="0"
      min_height="300"
-     top="30"
-     width="255">
+     top="0"
+     width="220">
         <texture_picker
          enabled="false"
          follows="left|top|right"
-         height="300"
+         height="190"
          layout="topleft"
          left="10"
          name="pick_snapshot"
-         top="10"
-         width="245" />
-        <text
-         follows="left|top"
-         font="SansSerifBigBold"
-         height="15"
-         layout="topleft"
-         left="10"
-         name="Name:"
-         text_color="white"
-         value="Name:" />
+         top="20"
+         width="220" />
         <text
          follows="left|top|right"
-         height="15"
+         height="20"
          layout="topleft"
+         font="SansSerif"
+         font.style="BOLD"
          left="10"
          name="pick_name"
-         right="-10"
          text_color="white"
          value="[name]"
          word_wrap="true" />
         <text
          follows="left|top"
-         font="SansSerifBigBold"
-         height="15"
+         height="30"
          layout="topleft"
          left="10"
-         name="description_label"
+         name="pick_location"
          text_color="white"
-         top_pad="20"
-         valign="center"
-         value="Description:" />
+         top_pad="10"
+         width="255"
+         word_wrap="true"
+         value="[loading...]" />
         <text
          follows="left|top|right"
-         height="60"
+         height="150"
          layout="topleft"
          left="10"
+         top_pad="20"
          name="pick_desc"
-         right="-10"
          text_color="white"
-         valign="center"
+         width="225"
          value="[description]"
-         width="255"
          word_wrap="true" />
-        <text
-         follows="left|top"
-         font="SansSerifBigBold"
-         height="20"
-         layout="topleft"
-         left="10"
-         name="location_label"
-         text_color="white"
-         top_pad="20"
-         valign="bottom"
-         value="Location:" />
-        <text
-         follows="left|top"
-         height="30"
-         layout="topleft"
-         left="10"
-         name="pick_location"
-         text_color="white"
-         valign="center"
-         value="[loading...]" />
-    </panel>
+    </panel> 
     </panel>
     </scroll_container>
     <panel
@@ -136,9 +107,8 @@
      height="30"
      layout="topleft"
      top_pad="2"
-     left="8"
-     name="buttons"
-     right="-10">
+     left="10"
+     name="buttons">
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
@@ -148,14 +118,14 @@
          left="0"
          name="edit_btn"
          top="0"
-         width="50" />
+         width="80" />
         <button
          follows="bottom|left"
          font="SansSerifSmallBold"
          height="25"
          label="Teleport"
          layout="topleft"
-         left_pad="2"
+         left_pad="3"
          name="teleport_btn"
          top="0"
          width="80" />
@@ -165,9 +135,9 @@
          height="25"
          label="Map"
          layout="topleft"
-         left_pad="2"
+         left_pad="3"
          name="show_on_map_btn"
          top="0"
-         width="100" />
+         width="80" />
     </panel>
 </panel>
-- 
cgit v1.2.3


From c0681e561a83d2f5783795dc742a97811be870a8 Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Wed, 2 Sep 2009 21:11:44 +0000
Subject: DEV-38453 (part 1) - need to refer to the correct button in the help
 text for new Pref > Graphics layout - need to rename nodes in Pref > General
 that have the OPPOSITE meaning as viewer 1.23; we intentionally want to
 disconnect these from their prior, opposite translation

---
 indra/newview/skins/default/xui/en/notifications.xml             | 2 +-
 indra/newview/skins/default/xui/en/panel_preferences_general.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 98c9ec868a..3c66f99e6a 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -4495,7 +4495,7 @@ Link to this from a web page to give others easy access to this location, or try
    icon="alertmodal.tga"
    name="GraphicsPreferencesHelp"
    type="alertmodal">
-This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by checking the Custom checkbox and manipulating the following settings:
+This panel controls window size and resolution and the quality of the client&apos;s graphics.  The Preferences &gt; Graphics interface allows you to choose between four graphics levels: Low, Mid, High, and Ultra. You may also customize your graphics settings by clicking the Advanced button and manipulating the following settings:
 
 Shaders: Enable or disable various types of pixel shaders.
 
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
index 95d8d2ce2a..70292a38aa 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml
@@ -260,7 +260,7 @@
      label="Show my name"
      layout="topleft"
      left_delta="0"
-     name="show_my_name_checkbox"
+     name="show_my_name_checkbox1"
      top_pad="5"
      width="300" />
     <check_box
@@ -280,7 +280,7 @@
      label="Show group titles"
      layout="topleft"
      left_delta="-175"
-     name="show_all_title_checkbox"
+     name="show_all_title_checkbox1"
      top_pad="5"
      width="300" />
     <text
-- 
cgit v1.2.3


From 22bbba4dd4b4e2c0528a26e47cdeafee25e4bd2b Mon Sep 17 00:00:00 2001
From: Brian McGroarty <soft@lindenlab.com>
Date: Wed, 2 Sep 2009 23:06:00 +0000
Subject: DEV-39355 Remove ctrl-alt-V shortcut for View Admin Options

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index ef9e22d908..3570ef147c 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2210,8 +2210,7 @@
         <menu_item_check
          label="View Admin Options"
          layout="topleft"
-         name="View Admin Options"
-         shortcut="control|alt|V">
+         name="View Admin Options">
             <menu_item_check.on_check
              function="Advanced.CheckViewAdminOptions"
              parameter="ViewAdminOptions" />
-- 
cgit v1.2.3


From 295dfd43519136e24e8662ba883de19de309858d Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Thu, 3 Sep 2009 00:20:39 +0000
Subject: DEV-31909 Revise strings.xml used in LSL editor hovertips We are not
 going to use \n in the XML to refer to a newline in the official viewer. I
 changed these to a real CRLF.

---
 indra/newview/skins/default/xui/en/strings.xml | 1783 +++++++++++++++++++-----
 1 file changed, 1432 insertions(+), 351 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4c9b1897d5..323c08ec4c 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -288,358 +288,1439 @@
 	<string name="choose_the_directory">Choose Directory</string>
 	
 	<!-- LSL Usage Hover Tips -->
-	<string name="LSLTipSleepTime">Sleeps script for [SLEEP_TIME] seconds.</string>
+	<string name="LSLTipSleepTime">
+Sleeps script for [SLEEP_TIME] seconds.
+	</string>
 	
-	<string name="LSLTipText_llSin">float llSin(float theta)\ntheta in radians</string>
-	<string name="LSLTipText_llCos">float llCos(float theta)\ntheta in radians</string>
-	<string name="LSLTipText_llTan">float llTan(float theta)\ntheta radians</string>
-	<string name="LSLTipText_llAtan2">float llAtan2(float y, float x)</string>
-	<string name="LSLTipText_llSqrt">float llSqrt(float val)\nreturns 0 and triggers a Math Error for imaginary results</string>
-	<string name="LSLTipText_llPow">float llPow(float base, float exponent)\nreturns 0 and triggers Math Error for imaginary results</string>
-	<string name="LSLTipText_llAbs">integer llAbs(integer val)</string>
-	<string name="LSLTipText_llFabs">float llFabs(float val)</string>
-	<string name="LSLTipText_llFrand">float llFrand(float mag)\nreturns random number in range [0,mag)</string>
-	<string name="LSLTipText_llFloor">integer llFloor(float val)\nreturns largest integer value &lt;= val</string>
-	<string name="LSLTipText_llCeil">integer llCeil(float val)\nreturns smallest integer value &gt;= val</string>
-	<string name="LSLTipText_llRound">integer llRound(float val)\nreturns val rounded to the nearest integer</string>
-	<string name="LSLTipText_llVecMag">float llVecMag(vector v)\nreturns the magnitude of v</string>
-	<string name="LSLTipText_llVecNorm">vector llVecNorm(vector v)\nreturns the v normalized</string>
-	<string name="LSLTipText_llVecDist">float llVecDist(vector v1, vector v2)\nreturns the 3D distance between v1 and v2</string>
-	<string name="LSLTipText_llRot2Euler">vector llRot2Euler(rotation q)\nreturns the Euler representation (roll, pitch, yaw) of q</string>
-	<string name="LSLTipText_llEuler2Rot">rotation llEuler2Rot(vector v)\nreturns the rotation representation of Euler Angles v</string>
-	<string name="LSLTipText_llAxes2Rot">rotation llAxes2Rot(vector fwd, vector left, vector up)\nreturns the rotation defined by the coordinate axes</string>
-	<string name="LSLTipText_llRot2Fwd">vector llRot2Fwd(rotation q)\nreturns the forward vector defined by q</string>
-	<string name="LSLTipText_llRot2Left">vector llRot2Left(rotation q)\nreturns the left vector defined by q</string>
-	<string name="LSLTipText_llRot2Up">vector llRot2Up(rotation q)\nreturns the up vector defined by q</string>
-	<string name="LSLTipText_llRotBetween">rotation llRotBetween(vector v1, vector v2)\nreturns the rotation to rotate v1 to v2</string>
-	<string name="LSLTipText_llWhisper">llWhisper(integer channel, string msg)\nwhispers msg on channel</string>
-	<string name="LSLTipText_llSay">llSay(integer channel, string msg)\nsays msg on channel</string>
-	<string name="LSLTipText_llShout">llShout(integer channel, string msg)\nshouts msg on channel</string>
-	<string name="LSLTipText_llListen">integer llListen(integer channel, string name, key id, string msg)\nsets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen</string>
-	<string name="LSLTipText_llListenControl">llListenControl(integer number, integer active)\nmakes a listen event callback active or inactive</string>
-	<string name="LSLTipText_llListenRemove">llListenRemove(integer number)\nremoves listen event callback number</string>
-	<string name="LSLTipText_llSensor">llSensor(string name, key id, integer type, float range, float arc)\nPerforms a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)</string>
-	<string name="LSLTipText_llSensorRepeat">llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)\nsets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds</string>
-	<string name="LSLTipText_llSensorRemove">llSensorRemove()\nremoves sensor</string>
-	<string name="LSLTipText_llDetectedName">string llDetectedName(integer number)\nreturns the name of detected object number (returns empty string if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedKey">key llDetectedKey(integer number)\nreturns the key of detected object number (returns empty key if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedOwner">key llDetectedOwner(integer number)\nreturns the key of detected object&apos;s owner (returns empty key if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedType">integer llDetectedType(integer number)\nreturns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedPos">vector llDetectedPos(integer number)\nreturns the position of detected object number (returns &lt;0,0,0&gt; if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedVel">vector llDetectedVel(integer number)\nreturns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedGrab">vector llDetectedGrab(integer number)\nreturns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedRot">rotation llDetectedRot(integer number)\nreturns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not valid sensed object)</string>
-	<string name="LSLTipText_llDetectedGroup">integer llDetectedGroup(integer number)\nReturns TRUE if detected object is part of same group as owner</string>
-	<string name="LSLTipText_llDetectedLinkNumber">integer llDetectedLinkNumber(integer number)\nreturns the link position of the triggered event for touches and collisions only</string>
-	<string name="LSLTipText_llDie">llDie()\ndeletes the object</string>
-	<string name="LSLTipText_llGround">float llGround(vector v)\nreturns the ground height below the object position + v</string>
-	<string name="LSLTipText_llCloud">float llCloud(vector v)\nreturns the cloud density at the object position + v</string>
-	<string name="LSLTipText_llWind">vector llWind(vector v)\nreturns the wind velocity at the object position + v</string>
-	<string name="LSLTipText_llSetStatus">llSetStatus(integer status, integer value)\nsets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB,\nSTATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value</string>
-	<string name="LSLTipText_llGetStatus">integer llGetStatus(integer status)\ngets value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB,\nSTATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)</string>
-	<string name="LSLTipText_llSetScale">llSetScale(vector scale)\nsets the scale</string>
-	<string name="LSLTipText_llGetScale">vector llGetScale()\ngets the scale</string>
-	<string name="LSLTipText_llSetColor">llSetColor(vector color, integer face)\nsets the color</string>
-	<string name="LSLTipText_llGetAlpha">float llGetAlpha(integer face)\ngets the alpha</string>
-	<string name="LSLTipText_llSetAlpha">llSetAlpha(float alpha, integer face)\nsets the alpha</string>
-	<string name="LSLTipText_llGetColor">vector llGetColor(integer face)\ngets the color</string>
-	<string name="LSLTipText_llSetTexture">llSetTexture(string texture, integer face)\nsets the texture of face</string>
-	<string name="LSLTipText_llScaleTexture">llScaleTexture(float scales, float scalet, integer face)\nsets the texture s, t scales for the chosen face</string>
-	<string name="LSLTipText_llOffsetTexture">llOffsetTexture(float offsets, float offsett, integer face)\nsets the texture s, t offsets for the chosen face</string>
-	<string name="LSLTipText_llRotateTexture">llRotateTexture(float rotation, integer face)\nsets the texture rotation for the chosen face</string>
-	<string name="LSLTipText_llGetTexture">string llGetTexture(integer face)\ngets the texture of face (if it&apos;s a texture in the object inventory, otherwise the key in a string)</string>
-	<string name="LSLTipText_llSetPos">llSetPos(vector pos)\nsets the position (if the script isn&apos;t physical)</string>
-	<string name="LSLTipText_llGetPos">vector llGetPos()\ngets the position (if the script isn&apos;t physical)</string>
-	<string name="LSLTipText_llGetLocalPos">vector llGetLocalPos()\ngets the position relative to the root (if the script isn&apos;t physical)</string>
-	<string name="LSLTipText_llSetRot">llSetRot(rotation rot)\nsets the rotation (if the script isn&apos;t physical)</string>
-	<string name="LSLTipText_llGetRot">rotation llGetRot()\ngets the rotation (if the script isn&apos;t physical)</string>
-	<string name="LSLTipText_llGetLocalRot">rotation llGetLocalRot()\ngets the rotation local to the root (if the script isn&apos;t physical)</string>
-	<string name="LSLTipText_llSetForce">llSetForce(vector force, integer local)\nsets force on object, in local coords if local == TRUE (if the script is physical)</string>
-	<string name="LSLTipText_llGetForce">vector llGetForce()\ngets the force (if the script is physical)</string>
-	<string name="LSLTipText_llTarget">integer llTarget(vector position, float range)\nset positions within range of position as a target and return an ID for the target</string>
-	<string name="LSLTipText_llTargetRemove">llTargetRemove(integer number)\nremoves target number</string>
-	<string name="LSLTipText_llRotTarget">integer llRotTarget(rotation rot, float error)\nset rotations with error of rot as a rotational target and return an ID for the rotational target</string>
-	<string name="LSLTipText_llRotTargetRemove">llRotTargetRemove(integer number)\nremoves rotational target number</string>
-	<string name="LSLTipText_llMoveToTarget">llMoveToTarget(vector target, float tau)\ncritically damp to target in tau seconds (if the script is physical)</string>
-	<string name="LSLTipText_llStopMoveToTarget">llStopMoveToTarget()\nStops critically damped motion</string>
-	<string name="LSLTipText_llApplyImpulse">llApplyImpulse(vector force, integer local)\napplies impulse to object, in local coords if local == TRUE (if the script is physical)</string>
-	<string name="LSLTipText_llApplyRotationalImpulse">llApplyRotationalImpulse(vector force, integer local)\napplies rotational impulse to object, in local coords if local == TRUE (if the script is physical)</string>
-	<string name="LSLTipText_llSetTorque">llSetTorque(vector torque, integer local)\nsets the torque of object, in local coords if local == TRUE (if the script is physical)</string>
-	<string name="LSLTipText_llGetTorque">vector llGetTorque()\ngets the torque (if the script is physical)</string>
-	<string name="LSLTipText_llSetForceAndTorque">llSetForceAndTorque(vector force, vector torque, integer local)\nsets the force and torque of object, in local coords if local == TRUE (if the script is physical)</string>
-	<string name="LSLTipText_llGetVel">vector llGetVel()\ngets the velocity</string>
-	<string name="LSLTipText_llGetAccel">vector llGetAccel()\ngets the acceleration</string>
-	<string name="LSLTipText_llGetOmega">vector llGetOmega()\ngets the omega</string>
-	<string name="LSLTipText_llGetTimeOfDay">float llGetTimeOfDay()\ngets the time in seconds since Second Life server midnight (or since server up-time; whichever is smaller)</string>
-	<string name="LSLTipText_llGetWallclock">float llGetWallclock()\ngets the time in seconds since midnight</string>
-	<string name="LSLTipText_llGetTime">float llGetTime()\ngets the time in seconds since creation</string>
-	<string name="LSLTipText_llResetTime">llResetTime()\nsets the time to zero</string>
-	<string name="LSLTipText_llGetAndResetTime">float llGetAndResetTime()\ngets the time in seconds since creation and sets the time to zero</string>
-	<string name="LSLTipText_llSound">llSound(string sound, float volume, integer queue, integer loop)\nplays sound at volume and whether it should loop or not</string>
-	<string name="LSLTipText_llPlaySound">llPlaySound(string sound, float volume)\nplays attached sound once at volume (0.0 - 1.0)</string>
-	<string name="LSLTipText_llLoopSound">llLoopSound(string sound, float volume)\nplays attached sound looping indefinitely at volume (0.0 - 1.0)</string>
-	<string name="LSLTipText_llLoopSoundMaster">llLoopSoundMaster(string sound, float volume)\nplays attached sound looping at volume (0.0 - 1.0), declares it a sync master</string>
-	<string name="LSLTipText_llLoopSoundSlave">llLoopSoundSlave(string sound, float volume)\nplays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master</string>
-	<string name="LSLTipText_llPlaySoundSlave">llPlaySoundSlave(string sound, float volume)\nplays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master</string>
-	<string name="LSLTipText_llTriggerSound">llTriggerSound(string sound, float volume)\nplays sound at volume (0.0 - 1.0), centered at but not attached to object</string>
-	<string name="LSLTipText_llStopSound">llStopSound()\nStops currently attached sound</string>
-	<string name="LSLTipText_llPreloadSound">llPreloadSound(string sound)\npreloads a sound on viewers within range</string>
-	<string name="LSLTipText_llGetSubString">string llGetSubString(string src, integer start, integer end)\nreturns the indicated substring</string>
-	<string name="LSLTipText_llDeleteSubString">string llDeleteSubString(string src, integer start, integer end)\nremoves the indicated substring and returns the result</string>
-	<string name="LSLTipText_llInsertString">string llInsertString(string dst, integer position, string src)\ninserts src into dst at position and returns the result</string>
-	<string name="LSLTipText_llToUpper">string llToUpper(string src)\nconvert src to all upper case and returns the result</string>
-	<string name="LSLTipText_llToLower">string llToLower(string src)\nconvert src to all lower case and returns the result</string>
-	<string name="LSLTipText_llGiveMoney">llGiveMoney(key destination, integer amount)\ntransfer amount of money from script owner to destination</string>
-	<string name="LSLTipText_llMakeExplosion">llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)\nMake a round explosion of particles</string>
-	<string name="LSLTipText_llMakeFountain">llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)\nMake a fountain of particles</string>
-	<string name="LSLTipText_llMakeSmoke">llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)\nMake smoke like particles</string>
-	<string name="LSLTipText_llMakeFire">llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)\nMake fire like particles</string>
-	<string name="LSLTipText_llRezObject">llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)\nInstanciate owners inventory object at pos with velocity vel and rotation rot with start parameter param</string>
-	<string name="LSLTipText_llLookAt">llLookAt(vector target, F32 strength, F32 damping)\nCause object name to point it&apos;s forward axis towards target</string>
-	<string name="LSLTipText_llStopLookAt">llStopLookAt()\nStop causing object name to point at a target</string>
-	<string name="LSLTipText_llSetTimerEvent">llSetTimerEvent(float sec)\nCause the timer event to be triggered every sec seconds</string>
-	<string name="LSLTipText_llSleep">llSleep(float sec)\nPut script to sleep for sec seconds</string>
-	<string name="LSLTipText_llGetMass">float llGetMass()\nGet the mass of task name that script is attached to</string>
-	<string name="LSLTipText_llCollisionFilter">llCollisionFilter(string name, key id, integer accept)\nif accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id</string>
-	<string name="LSLTipText_llTakeControls">llTakeControls(integer controls, integer accept, integer pass_on)\nTake controls from agent task has permissions for.  If (accept == (controls &amp; input)), send input to task.  If pass_on send to agent also.</string>
-	<string name="LSLTipText_llReleaseControls">llReleaseControls()\nStop taking inputs</string>
-	<string name="LSLTipText_llAttachToAvatar">llAttachToAvatar(integer attachment)\nAttach to avatar task has permissions for at point attachment</string>
-	<string name="LSLTipText_llDetachFromAvatar">llDetachFromAvatar()\nDrop off of avatar</string>
-	<string name="LSLTipText_llTakeCamera">llTakeCamera(key avatar)\nMove avatar&apos;s viewpoint to task</string>
-	<string name="LSLTipText_llReleaseCamera">llReleaseCamera(key avatar)\nReturn camera to agent</string>
-	<string name="LSLTipText_llGetOwner">key llGetOwner()\nReturns the owner of the task</string>
-	<string name="LSLTipText_llInstantMessage">llInstantMessage(key user, string message)\nIMs message to the user</string>
-	<string name="LSLTipText_llEmail">llEmail(string address, string subject, string message)\nSends email to address with subject and message</string>
-	<string name="LSLTipText_llGetNextEmail">llGetNextEmail(string address, string subject)\nGet the next waiting email with appropriate address and/or subject (if blank they are ignored)</string>
-	<string name="LSLTipText_llGetKey">key llGetKey()\nGet the key for the task the script is attached to</string>
-	<string name="LSLTipText_llSetBuoyancy">llSetBuoyancy(float buoyancy)\nSet the tasks buoyancy (0 is none, &lt; 1.0 sinks, 1.0 floats, > 1.0 rises)</string>
-	<string name="LSLTipText_llSetHoverHeight">llSetHoverHeight(float height, integer water, float tau)\nCritically damps to a height (either above ground level or above the higher of land and water if water == TRUE)</string>
-	<string name="LSLTipText_llStopHover">llStopHover()\nStop hovering to a height</string>
-	<string name="LSLTipText_llMinEventDelay">llMinEventDelay(float delay)\nSet the minimum time between events being handled</string>
-	<string name="LSLTipText_llSoundPreload">llSoundPreload(string sound)\npreloads a sound on viewers within range</string>
-	<string name="LSLTipText_llRotLookAt">llRotLookAt(rotation target, F32 strength, F32 damping)\nCause object name to point it&apos;s forward axis towards target</string>
-	<string name="LSLTipText_llStringLength">integer llStringLength(string str)\nReturns the length of string</string>
-	<string name="LSLTipText_llStartAnimation">llStartAnimation(string anim)\nStart animation anim for agent that owns object</string>
-	<string name="LSLTipText_llStopAnimation">llStopAnimation(string anim)\nStop animation anim for agent that owns object</string>
-	<string name="LSLTipText_llPointAt">llPointAt(vector pos)\nMake agent that owns object point at pos</string>
-	<string name="LSLTipText_llStopPointAt">llStopPointAt()\nStop agent that owns object pointing</string>
-	<string name="LSLTipText_llTargetOmega">llTargetOmega(vector axis, float spinrate, float gain)\nAttempt to spin at spinrate with strength gain</string>
-	<string name="LSLTipText_llGetStartParameter">integer llGetStartParameter()\nGet's the start paramter passed to llRezObject</string>
-	<string name="LSLTipText_llGodLikeRezObject">llGodLikeRezObject(key inventory, vector pos)\nrez directly off of a UUID if owner has dog-bit set</string>
-	<string name="LSLTipText_llRequestPermissions">llRequestPermissions(key agent, integer perm)\nask agent to allow the script to do perm (NB: Debit, ownership, link, joint, and permission requests can only go to the task's owner)</string>
-	<string name="LSLTipText_llGetPermissionsKey">key llGetPermissionsKey()\nReturn agent that permissions are enabled for.  NULL_KEY if not enabled</string>
-	<string name="LSLTipText_llGetPermissions">integer llGetPermissions()\nreturn what permissions have been enabled</string>
-	<string name="LSLTipText_llGetLinkNumber">integer llGetLinkNumber()\nReturns what number in a link set the script is attached to (0 means no link, 1 the root, 2 for first child, etc)</string>
-	<string name="LSLTipText_llSetLinkColor">llSetLinkColor(integer linknumber, vector color, integer face)\nIf a task exists in the link chain at linknumber, set face to color</string>
-	<string name="LSLTipText_llCreateLink">llCreateLink(key target, integer parent)\nAttempt to link task script is attached to and target (requires permission PERMISSION_CHANGE_LINKS be set). If parent == TRUE, task script is attached to is the root</string>
-	<string name="LSLTipText_llBreakLink">llBreakLink(integer linknum)\nDelinks the task with the given link number (requires permission PERMISSION_CHANGE_LINKS be set)</string>
-	<string name="LSLTipText_llBreakAllLinks">llBreakAllLinks()\nDelinks all tasks in the link set (requires permission PERMISSION_CHANGE_LINKS be set)</string>
-	<string name="LSLTipText_llGetLinkKey">key llGetLinkKey(integer linknum)\nGet the key of linknumber in link set</string>
-	<string name="LSLTipText_llGetLinkName">string llGetLinkName(integer linknum)\nGet the name of linknumber in link set</string>
-	<string name="LSLTipText_llGetInventoryNumber">integer llGetInventoryNumber(integer type)\nGet the number of items of a given type in the task's inventory.\nValid types: INVENTORY_TEXTURE, INVENTORY_SOUND, INVENTORY_OBJECT, INVENTORY_SCRIPT, INVENTORY_CLOTHING, INVENTORY_BODYPART, INVENTORY_NOTECARD, INVENTORY_LANDMARK, INVENTORY_ALL</string>
-	<string name="LSLTipText_llGetInventoryName">string llGetInventoryName(integer type, integer number)\nGet the name of the inventory item number of type</string>
-	<string name="LSLTipText_llSetScriptState">llSetScriptState(string name, integer run)\nControl the state of a script name.</string>
-	<string name="LSLTipText_llGetEnergy">float llGetEnergy()\nReturns how much energy is in the object as a percentage of maximum</string>
-	<string name="LSLTipText_llGiveInventory">llGiveInventory(key destination, string inventory)\nGive inventory to destination</string>
-	<string name="LSLTipText_llRemoveInventory">llRemoveInventory(string inventory)\nRemove the named inventory item</string>
-	<string name="LSLTipText_llSetText">llSetText(string text, vector color, float alpha)\nSet text floating over object</string>
-	<string name="LSLTipText_llWater">float llWater(vector v)\nreturns the water height below the object position + v</string>
-	<string name="LSLTipText_llPassTouches">llPassTouches(integer pass)\nif pass == TRUE, touches are passed from children on to parents (default is FALSE)</string>
-	<string name="LSLTipText_llRequestAgentData">key llRequestAgentData(key id, integer data)\nRequests data about agent id.  When data is available the dataserver event will be raised</string>
-	<string name="LSLTipText_llRequestInventoryData">key llRequestInventoryData(string name)\nRequests data from object's inventory object.  When data is available the dataserver event will be raised</string>
-	<string name="LSLTipText_llSetDamage">llSetDamage(float damage)\nSets the amount of damage that will be done to an object that this task hits.  Task will be killed.</string>
-	<string name="LSLTipText_llTeleportAgentHome">llTeleportAgentHome(key id)\nTeleports agent on owner's land to agent's home location</string>
-	<string name="LSLTipText_llModifyLand">llModifyLand(integer action, integer size)\nModify land with action (LAND_LEVEL, LAND_RAISE, LAND_LOWER, LAND_SMOOTH, LAND_NOISE, LAND_REVERT)\non size (LAND_SMALL_BRUSH, LAND_MEDIUM_BRUSH, LAND_LARGE_BRUSH)</string>
-	<string name="LSLTipText_llCollisionSound">llCollisionSound(string impact_sound, float impact_volume)\nSuppress default collision sounds, replace default impact sounds with impact_sound (empty string to just suppress)</string>
-	<string name="LSLTipText_llCollisionSprite">llCollisionSprite(string impact_sprite)\nSuppress default collision sprites, replace default impact sprite with impact_sprite (empty string to just suppress)</string>
-	<string name="LSLTipText_llGetAnimation">string llGetAnimation(key id)\nGet the currently playing locomotion animation for avatar id</string>
-	<string name="LSLTipText_llResetScript">llResetScript()\nResets the script</string>
-	<string name="LSLTipText_llMessageLinked">llMessageLinked(integer linknum, integer num, string str, key id)\nSends num, str, and id to members of the link set (LINK_ROOT sends to root task in a linked set,\nLINK_SET sends to all tasks,\nLINK_ALL_OTHERS to all other tasks,\nLINK_ALL_CHILDREN to all children,\nLINK_THIS to the task the script it is in)</string>
-	<string name="LSLTipText_llPushObject">llPushObject(key id, vector impulse, vector ang_impulse, integer local)\nApplies impulse and ang_impulse to object id</string>
-	<string name="LSLTipText_llPassCollisions">llPassCollisions(integer pass)\nif pass == TRUE, collisions are passed from children on to parents (default is FALSE)</string>
-	<string name="LSLTipText_llGetScriptName">llGetScriptName()\nReturns the script name</string>
-	<string name="LSLTipText_llGetNumberOfSides">integer llGetNumberOfSides()\nReturns the number of sides</string>
-	<string name="LSLTipText_llAxisAngle2Rot">rotation llAxisAngle2Rot(vector axis, float angle)\nReturns the rotation generated angle about axis</string>
-	<string name="LSLTipText_llRot2Axis">vector llRot2Axis(rotation rot)\nReturns the rotation axis represented by rot</string>
-	<string name="LSLTipText_llRot2Angle">float llRot2Angle(rotation rot)\nReturns the rotation angle represented by rot</string>
-	<string name="LSLTipText_llAcos">float llAcos(float val)\nReturns the arccosine in radians of val</string>
-	<string name="LSLTipText_llAsin">float llAsin(float val)\nReturns the arcsine in radians of val</string>
-	<string name="LSLTipText_llAngleBetween">float llAngleBetween(rotation a, rotation b)\nReturns angle between rotation a and b</string>
-	<string name="LSLTipText_llGetInventoryKey">key llGetInventoryKey(string name)\nReturns the key of the inventory name</string>
-	<string name="LSLTipText_llAllowInventoryDrop">llAllowInventoryDrop(integer add)\nIf add == TRUE, users without permissions can still drop inventory items onto task</string>
-	<string name="LSLTipText_llGetSunDirection">vector llGetSunDirection()\nReturns the sun direction on the simulator</string>
-	<string name="LSLTipText_llGetTextureOffset">vector llGetTextureOffset(integer side)\nReturns the texture offset of side in the x and y components of a vector</string>
-	<string name="LSLTipText_llGetTextureScale">vector llGetTextureScale(integer side)\nReturns the texture scale of side in the x and y components of a vector</string>
-	<string name="LSLTipText_llGetTextureRot">float llGetTextureRot(integer side)\nReturns the texture rotation of side</string>
-	<string name="LSLTipText_llSubStringIndex">integer llSubStringIndex(string source, string pattern)\nFinds index in source where pattern first appears (returns -1 if not found)</string>
-	<string name="LSLTipText_llGetOwnerKey">key llGetOwnerKey(key id)\nFind the owner of id</string>
-	<string name="LSLTipText_llGetCenterOfMass">vector llGetCenterOfMass()\nGet the object's center of mass</string>
-	<string name="LSLTipText_llListSort">list llListSort(list src, integer stride, integer ascending)\nSort the list into blocks of stride in ascending order if ascending == TRUE.  Note that sort only works between same types.</string>
-	<string name="LSLTipText_llGetListLength">integer llGetListLength(list src)\nGet the number of elements in the list</string>
-	<string name="LSLTipText_llList2Integer">integer llList2Integer(list src, integer index)\nCopy the integer at index in the list</string>
-	<string name="LSLTipText_llList2Float">float llList2Float(list src, integer index)\nCopy the float at index in the list</string>
-	<string name="LSLTipText_llList2String">string llList2String(list src, integer index)\nCopy the string at index in the list</string>
-	<string name="LSLTipText_llList2Key">key llList2Key(list src, integer index)\nCopy the key at index in the list</string>
-	<string name="LSLTipText_llList2Vector">vector llList2Vector(list src, integer index)\nCopy the vector at index in the list</string>
-	<string name="LSLTipText_llList2Rot">rotation llList2Rot(list src, integer index)\nCopy the rotation at index in the list</string>
-	<string name="LSLTipText_llList2List">list llList2List(list src, integer start, integer end)\nCopy the slice of the list from start to end</string>
-	<string name="LSLTipText_llDeleteSubList">list llDeleteSubList(list src, integer start, integer end)\nRemove the slice from the list and return the remainder</string>
-	<string name="LSLTipText_llGetListEntryType">integer llGetListEntryType(list src, integer index)\nReturns the type of the index entry in the list\n(TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)</string>
-	<string name="LSLTipText_llList2CSV">string llList2CSV(list src)\nCreate a string of comma separated values from list</string>
-	<string name="LSLTipText_llCSV2List">list llCSV2List(string src)\nCreate a list from a string of comma separated values</string>
-	<string name="LSLTipText_llListRandomize">list llListRandomize(list src, integer stride)\nReturns a randomized list of blocks of size stride</string>
-	<string name="LSLTipText_llList2ListStrided">list llList2ListStrided(list src, integer start, integer end, integer stride)\nCopy the strided slice of the list from start to end</string>
-	<string name="LSLTipText_llGetRegionCorner">vector llGetRegionCorner()\nReturns a vector with the south west corner x,y position of the region the object is in</string>
-	<string name="LSLTipText_llListInsertList">list llListInsertList(list dest, list src, integer start)\nInserts src into dest at position start</string>
-	<string name="LSLTipText_llListFindList">integer llListFindList(list src, list test)\nReturns the start of the first instance of test in src, -1 if not found</string>
-	<string name="LSLTipText_llGetObjectName">string llGetObjectName()\nReturns the name of the object script is attached to</string>
-	<string name="LSLTipText_llSetObjectName">llSetObjectName(string name)\nSets the objects name</string>
-	<string name="LSLTipText_llGetDate">string llGetDate()\nGets the date as YYYY-MM-DD</string>
-	<string name="LSLTipText_llEdgeOfWorld">integer llEdgeOfWorld(vector pos, vector dir)\nChecks to see whether the border hit by dir from pos is the edge of the world (has no neighboring simulator)</string>
-	<string name="LSLTipText_llGetAgentInfo">integer llGetAgentInfo(key id)\nGets information about agent ID.\nReturns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.</string>
-	<string name="LSLTipText_llAdjustSoundVolume">llAdjustSoundVolume(float volume)\nadjusts volume of attached sound (0.0 - 1.0)</string>
-	<string name="LSLTipText_llSetSoundQueueing">llSetSoundQueueing(integer queue)\ndetermines whether attached sound calls wait for the current sound to finish (0 = no [default], nonzero = yes)</string>
-	<string name="LSLTipText_llSetSoundRadius">llSetSoundRadius(float radius)\nestablishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)</string>
-	<string name="LSLTipText_llKey2Name">string llKey2Name(key id)\nReturns the name of the object key, iff the object is in the current simulator, otherwise the empty string</string>
-	<string name="LSLTipText_llSetTextureAnim">llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)\nAnimate the texture on the specified face/faces</string>
-	<string name="LSLTipText_llTriggerSoundLimited">llTriggerSoundLimited(string sound, float volume, vector tne, vector bsw)\nplays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to AABB defined by vectors top-north-east and bottom-south-west</string>
-	<string name="LSLTipText_llEjectFromLand">llEjectFromLand(key pest)\nEjects pest from land that you own</string>
-	<string name="LSLTipText_llParseString2List">list llParseString2List(string src, list separators, list spacers)\nBreaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each)</string>
-	<string name="LSLTipText_llOverMyLand">integer llOverMyLand(key id)\nReturns TRUE if id is over land owner of object owns, FALSE otherwise</string>
-	<string name="LSLTipText_llGetLandOwnerAt">key llGetLandOwnerAt(vector pos)\nReturns the key of the land owner, NULL_KEY if public</string>
-	<string name="LSLTipText_llGetNotecardLine">key llGetNotecardLine(string name, integer line)\nReturns line line of notecard name via the dataserver event</string>
-	<string name="LSLTipText_llGetAgentSize">vector llGetAgentSize(key id)\nIf the agent is in the same sim as the object, returns the size of the avatar</string>
-	<string name="LSLTipText_llSameGroup">integer llSameGroup(key id)\nReturns TRUE if ID is in the same sim and has the same active group, otherwise FALSE</string>
-	<string name="LSLTipText_llUnSit">key llUnSit(key id)\nIf agent identified by id is sitting on the object the script is attached to or is over land owned by the objects owner, the agent is forced to stand up</string>
-	<string name="LSLTipText_llGroundSlope">vector llGroundSlope(vector v)\nreturns the ground slope below the object position + v</string>
-	<string name="LSLTipText_llGroundNormal">vector llGroundNormal(vector v)\nreturns the ground normal below the object position + v</string>
-	<string name="LSLTipText_llGroundContour">vector llGroundCountour(vector v)\nreturns the ground contour below the object position + v</string>
-	<string name="LSLTipText_llGetAttached">integer llGetAttached()\nreturns the object attachment point or 0 if not attached</string>
-	<string name="LSLTipText_llGetFreeMemory">integer llGetFreeMemory()\nreturns the available heap space for the current script</string>
-	<string name="LSLTipText_llGetRegionName">string llGetRegionName()\nreturns the current region name</string>
-	<string name="LSLTipText_llGetRegionTimeDilation">float llGetRegionTimeDilation()\nreturns the current time dilation as a float between 0 and 1</string>
-	<string name="LSLTipText_llGetRegionFPS">float llGetRegionFPS()\nreturns the mean region frames per second</string>
-	<string name="LSLTipText_llParticleSystem">llParticleSystem(list rules)\nCreates a particle system based on rules.  Empty list removes particle system from object.\nList format is [ rule1, data1, rule2, data2 . . . rulen, datan ]</string>
-	<string name="LSLTipText_llGroundRepel">llGroundRepel(float height, integer water, float tau)\nCritically damps to height if within height*0.5 of level (either above ground level or above the higher of land and water if water == TRUE)</string>
-	<string name="LSLTipText_llGiveInventoryList">llGiveInventoryList(key destination, string category, list inventory)\nGive inventory to destination in a new category</string>
-	<string name="LSLTipText_llSetVehicleType">llSetVehicleType(integer type)\nsets vehicle to one of the default types</string>
-	<string name="LSLTipText_llSetVehicleFloatParam">llSetVehicleFloatParam(integer param, float value)\nsets the specified vehicle float parameter</string>
-	<string name="LSLTipText_llSetVehicleVectorParam">llSetVehicleVectorParam(integer param, vector vec)\nsets the specified vehicle vector parameter</string>
-	<string name="LSLTipText_llSetVehicleRotationParam">llSetVehicleVectorParam(integer param, rotation rot)\nsets the specified vehicle rotation parameter</string>
-	<string name="LSLTipText_llSetVehicleFlags">llSetVehicleFlags(integer flags)\nsets the enabled bits in 'flags'</string>
-	<string name="LSLTipText_llRemoveVehicleFlags">llRemoveVehicleFlags(integer flags)\nremoves the enabled bits in 'flags'</string>
-	<string name="LSLTipText_llSitTarget">llSitTarget(vector offset, rotation rot)\nSet the sit location for this object (if offset == &lt;0,0,0&gt; clear it)</string>
-	<string name="LSLTipText_llAvatarOnSitTarget">key llAvatarOnSitTarget()\nIf an avatar is sitting on the sit target, return the avatar's key, NULL_KEY otherwise</string>
-	<string name="LSLTipText_llAddToLandPassList">llAddToLandPassList(key avatar, float hours)\nAdd avatar to the land pass list for hours</string>
-	<string name="LSLTipText_llSetTouchText">llSetTouchText(string text)\nDisplays text in pie menu that acts as a touch</string>
-	<string name="LSLTipText_llSetSitText">llSetSitText(string text)\nDisplays text rather than sit in pie menu</string>
-	<string name="LSLTipText_llSetCameraEyeOffset">llSetCameraEyeOffset(vector offset)\nSets the camera eye offset used in this object if an avatar sits on it</string>
-	<string name="LSLTipText_llSetCameraAtOffset">llSetCameraAtOffset(vector offset)\nSets the camera at offset used in this object if an avatar sits on it</string>
-	<string name="LSLTipText_llDumpList2String">string llDumpList2String(list src, string separator)\nWrite the list out in a single string using separator between values</string>
-	<string name="LSLTipText_llScriptDanger">integer llScriptDanger(vector pos)\nReturns true if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts</string>
-	<string name="LSLTipText_llDialog">llDialog(key avatar, string message, list buttons, integer chat_channel\nShows a dialog box on the avatar's screen with the message.\nUp to 12 strings in the list form buttons.\nIf a button is clicked, the name is chatted on chat_channel.</string>
-	<string name="LSLTipText_llVolumeDetect">llVolumeDetect(integer detect)\nIf detect = TRUE, object becomes phantom but triggers collision_start and collision_end events\nwhen other objects start and stop interpenetrating.\nMust be applied to the root object.</string>
-	<string name="LSLTipText_llResetOtherScript">llResetOtherScript(string name)\nResets script name</string>
-	<string name="LSLTipText_llGetScriptState">integer llGetScriptState(string name)\nResets TRUE if script name is running</string>
-	<string name="LSLTipText_llRemoteLoadScript">Deprecated.  Please use llRemoteLoadScriptPin instead.</string>
-	<string name="LSLTipText_llSetRemoteScriptAccessPin">llSetRemoteScriptAccessPin(integer pin)\nIf pin is set to a non-zero number, the task will accept remote script\nloads via llRemoteLoadScriptPin if it passes in the correct pin.\nOthersise, llRemoteLoadScriptPin is ignored.</string>
-	<string name="LSLTipText_llRemoteLoadScriptPin">llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)\nIf the owner of the object this script is attached can modify target,\nthey are in the same region,\nand the matching pin is used,\ncopy script name onto target,\nif running == TRUE, start the script with param.</string>
-	<string name="LSLTipText_llOpenRemoteDataChannel">llOpenRemoteDataChannel()\nCreates a channel to listen for XML-RPC calls.  Will trigger a remote_data event with channel id once it is available.</string>
-	<string name="LSLTipText_llSendRemoteData">key llSendRemoteData(key channel, string dest, integer idata, string sdata)\nSend an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.\nA message identifier key is returned.\nAn XML-RPC reply will trigger a remote_data event and reference the message id.\nThe message_id is returned.</string>
-	<string name="LSLTipText_llRemoteDataReply">llRemoteDataReply(key channel, key message_id, string sdata, integer idata)\nSend an XML-RPC reply to message_id on channel with payload of string sdata and integer idata</string>
-	<string name="LSLTipText_llCloseRemoteDataChannel">llCloseRemoteDataChannel(key channel)\nCloses XML-RPC channel.</string>
-	<string name="LSLTipText_llMD5String">string llMD5String(string src, integer nonce)\nPerforms a RSA Data Security, Inc. MD5 Message-Digest Algorithm on string with nonce.  Returns a 32 character hex string.</string>
-	<string name="LSLTipText_llSetPrimitiveParams">llSetPrimitiveParams(list rules)\nSet primitive parameters based on rules.</string>
-	<string name="LSLTipText_llStringToBase64">string llStringToBase64(string str)\nConverts a string to the Base 64 representation of the string.</string>
-	<string name="LSLTipText_llBase64ToString">string llBase64ToString(string str)\nConverts a Base 64 string to a conventional string.  If the conversion creates any unprintable characters, they are converted to spaces.</string>
-	<string name="LSLTipText_llXorBase64Strings">string llXorBase64Strings(string s1, string s2)\nDEPRECATED!  Please use llXorBase64StringsCorrect instead!!  Incorrectly performs an exclusive or on two Base 64 strings and returns a Base 64 string.  s2 repeats if it is shorter than s1.  Retained for backwards compatability.</string>
-	<string name="LSLTipText_llRemoteDataSetRegion">llRemoteDataSetRegion()\nIf an object using remote data channels changes regions, you must call this function to reregister the remote data channels.\nYou do not need to make this call if you don't change regions.</string>
-	<string name="LSLTipText_llLog10">float llLog10(float val)\nReturns the base 10 log of val if val &gt; 0, otherwise returns 0.</string>
-	<string name="LSLTipText_llLog">float llLog(float val)\nReturns the base e log of val if val &gt; 0, otherwise returns 0.</string>
-	<string name="LSLTipText_llGetAnimationList">list llGetAnimationList(key id)\nGets a list of all playing animations for avatar id</string>
-	<string name="LSLTipText_llSetParcelMusicURL">llSetParcelMusicURL(string url)\nSets the streaming audio URL for the parcel object is on</string>
-	<string name="LSLTipText_llGetRootPosition">vector llGetRootPosition()\nGets the global position of the root object of the object script is attached to</string>
-	<string name="LSLTipText_llGetRootRotation">rotation llGetRootRotation()\nGets the global rotation of the root object of the object script is attached to</string>
-	<string name="LSLTipText_llGetObjectDesc">string llGetObjectDesc()\nReturns the description of the object the script is attached to</string>
-	<string name="LSLTipText_llSetObjectDesc">llSetObjectDesc(string name)\nSets the object's description</string>
-	<string name="LSLTipText_llGetCreator">key llGetCreator()\nReturns the creator of the object</string>
-	<string name="LSLTipText_llGetTimestamp">string llGetTimestamp()\nGets the timestamp in the format: YYYY-MM-DDThh:mm:ss.ff..fZ</string>
-	<string name="LSLTipText_llSetLinkAlpha">llSetLinkAlpha(integer linknumber, float alpha, integer face)\nIf a prim exists in the link chain at linknumber, set face to alpha</string>
-	<string name="LSLTipText_llGetNumberOfPrims">integer llGetNumberOfPrims()\nReturns the number of prims in a link set the script is attached to</string>
-	<string name="LSLTipText_llGetNumberOfNotecardLines">key llGetNumberOfNotecardLines(string name)\nReturns number of lines in notecard 'name' via the dataserver event (cast return value to integer)</string>
-	<string name="LSLTipText_llGetBoundingBox">list llGetBoundingBox(key object)\nReturns the bounding box around an object (including any linked prims) relative to the root prim, in a list:  [ (vector) min_corner, (vector) max_corner ]</string>
-	<string name="LSLTipText_llGetGeometricCenter">vector llGetGeometricCenter()\nReturns the geometric center of the linked set the script is attached to.</string>
-	<string name="LSLTipText_llGetPrimitiveParams">list llGetPrimitiveParams(list params)\nGets primitive parameters specified in the params list.</string>
-	<string name="LSLTipText_llIntegerToBase64">string llIntegerToBase64(integer number)\nBig endian encode of of integer as a Base64 string.</string>
-	<string name="LSLTipText_llBase64ToInteger">integer llBase64ToInteger(string str)\nBig endian decode of a Base64 string into an integer.</string>
-	<string name="LSLTipText_llGetGMTclock">float llGetGMTclock()\nGets the time in seconds since midnight in GMT</string>
-	<string name="LSLTipText_llGetSimulatorHostname">string llGetSimulatorHostname()\nGets the hostname of the machine script is running on (same as string in viewer Help dialog)</string>
-	<string name="LSLTipText_llSetLocalRot">llSetLocalRot(rotation rot)\nsets the rotation of a child prim relative to the root prim</string>
-	<string name="LSLTipText_llParseStringKeepNulls">list llParseStringKeepNulls(string src, list separators, list spacers)\nBreaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each), keeping any null values generated.</string>
-	<string name="LSLTipText_llRezAtRoot">llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)\nInstantiate owner's inventory object at pos with velocity vel and rotation rot with start parameter param.\nThe last selected root object's location will be set to pos</string>
-	<string name="LSLTipText_llGetObjectPermMask">integer llGetObjectPermMask(integer mask)\nReturns the requested permission mask for the root object the task is attached to.</string>
-	<string name="LSLTipText_llSetObjectPermMask">llSetObjectPermMask(integer mask, integer value)\nSets the given permission mask to the new value on the root object the task is attached to.</string>
-	<string name="LSLTipText_llGetInventoryPermMask">integer llGetInventoryPermMask(string item, integer mask)\nReturns the requested permission mask for the inventory item.</string>
-	<string name="LSLTipText_llSetInventoryPermMask">llSetInventoryPermMask(string item, integer mask, integer value)\nSets the given permission mask to the new value on the inventory item.</string>
-	<string name="LSLTipText_llGetInventoryCreator">key llGetInventoryCreator(string item)\nReturns the key for the creator of the inventory item.</string>
-	<string name="LSLTipText_llOwnerSay">llOwnerSay(string msg)\nsays msg to owner only (if owner in sim)</string>
-	<string name="LSLTipText_llRequestSimulatorData">key llRequestSimulatorData(string simulator, integer data)\nRequests data about simulator.  When data is available the dataserver event will be raised</string>
-	<string name="LSLTipText_llForceMouselook">llForceMouselook(integer mouselook)\nIf mouselook is TRUE any avatar that sits on this object is forced into mouselook mode</string>
-	<string name="LSLTipText_llGetObjectMass">float llGetObjectMass(key id)\nGet the mass of the object with key id</string>
-	<string name="LSLTipText_llListReplaceList">list llListReplaceList(list dest, list src, integer start, integer end)\nReplaces start through end of dest with src.</string>
-	<string name="LSLTipText_llLoadURL">llLoadURL(key avatar_id, string message, string url)\nShows dialog to avatar avatar_id offering to load web page at URL.  If user clicks yes, launches their web browser.</string>
-	<string name="LSLTipText_llParcelMediaCommandList">llParcelMediaCommandList(list command)\nSends a list of commands, some with arguments, to a parcel.</string>
-	<string name="LSLTipText_llParcelMediaQuery">list llParcelMediaQuery(list query)\nSends a list of queries, returns a list of results.</string>
-	<string name="LSLTipText_llModPow">integer llModPow(integer a, integer b, integer c)\nReturns a raised to the b power, mod c. ( (a**b)%c ).  b is capped at 0xFFFF (16 bits).</string>
-	<string name="LSLTipText_llGetInventoryType">integer llGetInventoryType(string name)\nReturns the type of the inventory name</string>
-	<string name="LSLTipText_llSetPayPrice">llSetPayPrice(integer price, list quick_pay_buttons)\nSets the default amount when someone chooses to pay this object.</string>
-	<string name="LSLTipText_llGetCameraPos">vector llGetCameraPos()\nGets current camera position for agent task has permissions for.</string>
-	<string name="LSLTipText_llGetCameraRot">rotation llGetCameraRot()\nGets current camera orientation for agent task has permissions for.</string>
-	<string name="LSLTipText_llSetPrimURL">llSetPrimURL(string url)\nUpdates the URL for the web page shown on the sides of the object.</string>
-	<string name="LSLTipText_llRefreshPrimURL">llRefreshPrimURL()\nReloads the web page shown on the sides of the object.</string>
-	<string name="LSLTipText_llEscapeURL">string llEscapeURL(string url)\nReturns and escaped/encoded version of url, replacing spaces with %20 etc.</string>
-	<string name="LSLTipText_llUnescapeURL">string llUnescapeURL(string url)\nReturns and unescaped/unencoded version of url, replacing %20 with spaces etc.</string>
-	<string name="LSLTipText_llMapDestination">llMapDestination(string simname, vector pos, vector look_at)\nOpens world map centered on region with pos highlighted.\nOnly works for scripts attached to avatar, or during touch events.\n(NOTE: look_at currently does nothing)</string>
-	<string name="LSLTipText_llAddToLandBanList">llAddToLandBanList(key avatar, float hours)\nAdd avatar to the land ban list for hours</string>
-	<string name="LSLTipText_llRemoveFromLandPassList">llRemoveFromLandPassList(key avatar)\nRemove avatar from the land pass list</string>
-	<string name="LSLTipText_llRemoveFromLandBanList">llRemoveFromLandBanList(key avatar)\nRemove avatar from the land ban list</string>
-	<string name="LSLTipText_llSetCameraParams">llSetCameraParams(list rules)\nSets multiple camera parameters at once.\nList format is [ rule1, data1, rule2, data2 . . . rulen, datan ]</string>
-	<string name="LSLTipText_llClearCameraParams">llClearCameraParams()\nResets all camera parameters to default values and turns off scripted camera control.</string>
-	<string name="LSLTipText_llListStatistics">float llListStatistics(integer operation, list l)\nPerform statistical aggregate functions on list l using LIST_STAT_* operations.</string>
-	<string name="LSLTipText_llGetUnixTime">integer llGetUnixTime()\nGet the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock.</string>
-	<string name="LSLTipText_llGetParcelFlags">integer llGetParcelFlags(vector pos)\nGet the parcel flags (PARCEL_FLAG_*) for the parcel including the point pos.</string>
-	<string name="LSLTipText_llGetRegionFlags">integer llGetRegionFlags()\nGet the region flags (REGION_FLAG_*) for the region the object is in.</string>
-	<string name="LSLTipText_llXorBase64StringsCorrect">string llXorBase64StringsCorrect(string s1, string s2)\nCorrectly performs an exclusive or on two Base 64 strings and returns a Base 64 string.  s2 repeats if it is shorter than s1.</string>
-	<string name="LSLTipText_llHTTPRequest">llHTTPRequest(string url, list parameters, string body)\nSend an HTTP request.</string>
-	<string name="LSLTipText_llResetLandBanList">llResetLandBanList()\nRemoves all residents from the land ban list.</string>
-	<string name="LSLTipText_llResetLandPassList">llResetLandPassList()\nRemoves all residents from the land access/pass list.</string>
-	<string name="LSLTipText_llGetObjectPrimCount">integer llGetObjectPrimCount(key object_id)\nReturns the total number of prims for an object.</string>
-	<string name="LSLTipText_llGetParcelPrimOwners">list llGetParcelPrimOwners(vector pos)\nReturns a list of all residents who own objects on the parcel and the number of objects they own.\nRequires owner-like permissions for the parcel.</string>
-	<string name="LSLTipText_llGetParcelPrimCount">integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)\nGets the number of prims on the parcel of the given category.\nCategories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP.</string>
-	<string name="LSLTipText_llGetParcelMaxPrims">integer llGetParcelMaxPrims(vector pos, integer sim_wide)\nGets the maximum number of prims allowed on the parcel at pos.</string>
-	<string name="LSLTipText_llGetParcelDetails">list llGetParcelDetails(vector pos, list params)\nGets the parcel details specified in params for the parcel at pos.\nParams is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA</string>
-	<string name="LSLTipText_llSetLinkPrimitiveParams">llSetLinkPrimitiveParams(integer linknumber, list rules)\nSet primitive parameters for linknumber based on rules.</string>
-	<string name="LSLTipText_llSetLinkTexture">llSetLinkTexture(integer link_pos, string texture, integer face)\nSets the texture of face for link_pos</string>
-	<string name="LSLTipText_llStringTrim">string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.</string>
-	<string name="LSLTipText_llRegionSay">llRegionSay(integer channel, string msg)\nbroadcasts msg to entire region on channel (not 0.)</string>
-	<string name="LSLTipText_llGetObjectDetails">list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR.</string>
-	<string name="LSLTipText_llSetClickAction">llSetClickAction(integer action)\nSets the action performed when a prim is clicked upon.</string>
-	<string name="LSLTipText_llGetRegionAgentCount">int llGetRegionAgentCount()\nreturns the number of agents in a region</string>
-	<string name="LSLTipText_llTextBox">llTextBox(key avatar, string message, integer chat_channel\nShows a dialog box on the avatar's screen with the message.\nA text box asks for input, and if entered the text is chatted on chat_channel.</string>
-	<string name="LSLTipText_llGetAgentLanguage">string llGetAgentLanguage(key id)\nGets the agents preferred language..</string>
-	<string name="LSLTipText_llDetectedTouchUV">vector llDetectedTouchUV(integer number)\nreturns the u and v coordinates in the first two components of a vector, for a triggered touch event</string>
-	<string name="LSLTipText_llDetectedTouchFace">integer llDetectedTouchFace(integer number)\nreturns the index of the face on the object for a triggered touch event</string>
-	<string name="LSLTipText_llDetectedTouchPos">vector llDetectedTouchPos(integer number)\nreturns the position touched for a triggered touch event</string>
-	<string name="LSLTipText_llDetectedTouchNormal">vector llDetectedTouchNormal(integer number)\nreturns the surface normal for a triggered touch event</string>
-	<string name="LSLTipText_llDetectedTouchBinormal">vector llDetectedTouchBinormal(integer number)\nreturns the surface binormal for a triggered touch event</string>
-	<string name="LSLTipText_llDetectedTouchST">vector llDetectedTouchST(integer number)\nreturns the s and t coordinates in the first two components of a vector, for a triggered touch event</string>
-	<string name="LSLTipText_llSHA1String">string llSHA1String(string sr)\nPerforms a SHA1 security Hash.  Returns a 40 character hex string.</string>
-	<string name="LSLTipText_llGetFreeURLs">integer llGetFreeURLs()\nreturns the available urls for the current script</string>
-	<string name="LSLTipText_llRequestURL">key llRequestURL()\nRequests one HTTP:// url for use by this object\nTriggers an http_server event with results.</string>
-	<string name="LSLTipText_llRequestSecureURL">key llRequestSecureURL()\nRequests one HTTPS:// (SSL) url for use by this object\nTriggers an http_server event with results.</string>
-	<string name="LSLTipText_llReleaseURL">llReleaseURL(string url)\nReleases the specified URL, it will no longer be usable.</string>
-	<string name="LSLTipText_llHTTPResponse">llHTTPResponse(key id, integer status, string body)\nResponds to request id with status and body.</string>
-	<string name="LSLTipText_llGetHTTPHeader">string llGetHTTPHeader(key id, string header)\nGet the value for header for request id.</string>
+	<string name="LSLTipText_llSin">
+float llSin(float theta)
+theta in radians
+	</string>
+	<string name="LSLTipText_llCos">
+float llCos(float theta)
+theta in radians
+	</string>
+	<string name="LSLTipText_llTan">
+float llTan(float theta)
+theta radians
+	</string>
+	<string name="LSLTipText_llAtan2">
+float llAtan2(float y, float x)
+	</string>
+	<string name="LSLTipText_llSqrt">
+float llSqrt(float val)
+returns 0 and triggers a Math Error for imaginary results
+	</string>
+	<string name="LSLTipText_llPow">
+float llPow(float base, float exponent)
+returns 0 and triggers Math Error for imaginary results
+	</string>
+	<string name="LSLTipText_llAbs">
+integer llAbs(integer val)
+	</string>
+	<string name="LSLTipText_llFabs">
+float llFabs(float val)
+	</string>
+	<string name="LSLTipText_llFrand">
+float llFrand(float mag)
+returns random number in range [0,mag)
+	</string>
+	<string name="LSLTipText_llFloor">
+integer llFloor(float val)
+returns largest integer value &lt;= val
+	</string>
+	<string name="LSLTipText_llCeil">
+integer llCeil(float val)
+returns smallest integer value &gt;= val
+	</string>
+	<string name="LSLTipText_llRound">
+integer llRound(float val)
+returns val rounded to the nearest integer
+	</string>
+	<string name="LSLTipText_llVecMag">
+float llVecMag(vector v)
+returns the magnitude of v
+	</string>
+	<string name="LSLTipText_llVecNorm">
+vector llVecNorm(vector v)
+returns the v normalized
+	</string>
+	<string name="LSLTipText_llVecDist">
+float llVecDist(vector v1, vector v2)
+returns the 3D distance between v1 and v2
+	</string>
+	<string name="LSLTipText_llRot2Euler">
+vector llRot2Euler(rotation q)
+returns the Euler representation (roll, pitch, yaw) of q
+	</string>
+	<string name="LSLTipText_llEuler2Rot">
+rotation llEuler2Rot(vector v)
+returns the rotation representation of Euler Angles v
+	</string>
+	<string name="LSLTipText_llAxes2Rot">
+rotation llAxes2Rot(vector fwd, vector left, vector up)
+returns the rotation defined by the coordinate axes
+	</string>
+	<string name="LSLTipText_llRot2Fwd">
+vector llRot2Fwd(rotation q)
+returns the forward vector defined by q
+	</string>
+	<string name="LSLTipText_llRot2Left">
+vector llRot2Left(rotation q)
+returns the left vector defined by q
+	</string>
+	<string name="LSLTipText_llRot2Up">
+vector llRot2Up(rotation q)
+returns the up vector defined by q
+	</string>
+	<string name="LSLTipText_llRotBetween">
+rotation llRotBetween(vector v1, vector v2)
+returns the rotation to rotate v1 to v2
+	</string>
+	<string name="LSLTipText_llWhisper">
+llWhisper(integer channel, string msg)
+whispers msg on channel
+	</string>
+	<string name="LSLTipText_llSay">
+llSay(integer channel, string msg)
+says msg on channel
+	</string>
+	<string name="LSLTipText_llShout">
+llShout(integer channel, string msg)
+shouts msg on channel
+	</string>
+	<string name="LSLTipText_llListen">
+integer llListen(integer channel, string name, key id, string msg)
+sets a callback for msg on channel from name and id (name, id, and/or msg can be empty) and returns an identifier that can be used to deactivate or remove the listen
+	</string>
+	<string name="LSLTipText_llListenControl">
+llListenControl(integer number, integer active)
+makes a listen event callback active or inactive
+	</string>
+	<string name="LSLTipText_llListenRemove">
+llListenRemove(integer number)
+removes listen event callback number
+	</string>
+	<string name="LSLTipText_llSensor">
+llSensor(string name, key id, integer type, float range, float arc)
+Performs a single scan for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0)
+	</string>
+	<string name="LSLTipText_llSensorRepeat">
+llSensorRepeat(string name, key id, integer type, float range, float arc, float rate)
+sets a callback for name and id with type (AGENT, ACTIVE, PASSIVE, and/or SCRIPTED) within range meters and arc radians of forward vector (name, id, and/or keytype can be empty or 0) and repeats every rate seconds
+	</string>
+	<string name="LSLTipText_llSensorRemove">
+llSensorRemove()
+removes sensor
+	</string>
+	<string name="LSLTipText_llDetectedName">
+string llDetectedName(integer number)
+returns the name of detected object number (returns empty string if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedKey">
+key llDetectedKey(integer number)
+returns the key of detected object number (returns empty key if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedOwner">
+key llDetectedOwner(integer number)
+returns the key of detected object&apos;s owner (returns empty key if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedType">
+integer llDetectedType(integer number)
+returns the type (AGENT, ACTIVE, PASSIVE, SCRIPTED) of detected object (returns 0 if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedPos">
+vector llDetectedPos(integer number)
+returns the position of detected object number (returns &lt;0,0,0&gt; if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedVel">
+vector llDetectedVel(integer number)
+returns the velocity of detected object number (returns &lt;0,0,0&gt; if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedGrab">
+vector llDetectedGrab(integer number)
+returns the grab offset of the user touching object (returns &lt;0,0,0&gt; if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedRot">
+rotation llDetectedRot(integer number)
+returns the rotation of detected object number (returns &lt;0,0,0,1&gt; if number is not valid sensed object)
+	</string>
+	<string name="LSLTipText_llDetectedGroup">
+integer llDetectedGroup(integer number)
+Returns TRUE if detected object is part of same group as owner
+	</string>
+	<string name="LSLTipText_llDetectedLinkNumber">
+integer llDetectedLinkNumber(integer number)
+returns the link position of the triggered event for touches and collisions only
+	</string>
+	<string name="LSLTipText_llDie">
+llDie()
+deletes the object
+	</string>
+	<string name="LSLTipText_llGround">
+float llGround(vector v)
+returns the ground height below the object position + v
+	</string>
+	<string name="LSLTipText_llCloud">
+float llCloud(vector v)
+returns the cloud density at the object position + v
+	</string>
+	<string name="LSLTipText_llWind">
+vector llWind(vector v)
+returns the wind velocity at the object position + v
+	</string>
+	<string name="LSLTipText_llSetStatus">
+llSetStatus(integer status, integer value)
+sets status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z) to value
+	</string>
+	<string name="LSLTipText_llGetStatus">
+integer llGetStatus(integer status)
+gets value of status (STATUS_PHYSICS, STATUS_PHANTOM, STATUS_BLOCK_GRAB, STATUS_ROTATE_X, STATUS_ROTATE_Y, and/or STATUS_ROTATE_Z)
+	</string>
+	<string name="LSLTipText_llSetScale">
+llSetScale(vector scale)
+sets the scale
+	</string>
+	<string name="LSLTipText_llGetScale">
+vector llGetScale()
+gets the scale
+	</string>
+	<string name="LSLTipText_llSetColor">
+llSetColor(vector color, integer face)
+sets the color
+	</string>
+	<string name="LSLTipText_llGetAlpha">
+float llGetAlpha(integer face)
+gets the alpha
+	</string>
+	<string name="LSLTipText_llSetAlpha">
+llSetAlpha(float alpha, integer face)
+sets the alpha
+	</string>
+	<string name="LSLTipText_llGetColor">
+vector llGetColor(integer face)
+gets the color
+	</string>
+	<string name="LSLTipText_llSetTexture">
+llSetTexture(string texture, integer face)
+sets the texture of face
+	</string>
+	<string name="LSLTipText_llScaleTexture">
+llScaleTexture(float scales, float scalet, integer face)
+sets the texture s, t scales for the chosen face
+	</string>
+	<string name="LSLTipText_llOffsetTexture">
+llOffsetTexture(float offsets, float offsett, integer face)
+sets the texture s, t offsets for the chosen face
+	</string>
+	<string name="LSLTipText_llRotateTexture">
+llRotateTexture(float rotation, integer face)
+sets the texture rotation for the chosen face
+	</string>
+	<string name="LSLTipText_llGetTexture">
+string llGetTexture(integer face)
+gets the texture of face (if it&apos;s a texture in the object inventory, otherwise the key in a string)
+	</string>
+	<string name="LSLTipText_llSetPos">
+llSetPos(vector pos)
+sets the position (if the script isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llGetPos">
+vector llGetPos()
+gets the position (if the script isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llGetLocalPos">
+vector llGetLocalPos()
+gets the position relative to the root (if the script isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llSetRot">
+llSetRot(rotation rot)
+sets the rotation (if the script isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llGetRot">
+rotation llGetRot()
+gets the rotation (if the script isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llGetLocalRot">
+rotation llGetLocalRot()
+gets the rotation local to the root (if the script isn&apos;t physical)
+	</string>
+	<string name="LSLTipText_llSetForce">
+llSetForce(vector force, integer local)
+sets force on object, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llGetForce">
+vector llGetForce()
+gets the force (if the script is physical)
+	</string>
+	<string name="LSLTipText_llTarget">
+integer llTarget(vector position, float range)
+set positions within range of position as a target and return an ID for the target
+	</string>
+	<string name="LSLTipText_llTargetRemove">
+llTargetRemove(integer number)
+removes target number
+	</string>
+	<string name="LSLTipText_llRotTarget">
+integer llRotTarget(rotation rot, float error)
+set rotations with error of rot as a rotational target and return an ID for the rotational target
+	</string>
+	<string name="LSLTipText_llRotTargetRemove">
+llRotTargetRemove(integer number)
+removes rotational target number
+	</string>
+	<string name="LSLTipText_llMoveToTarget">
+llMoveToTarget(vector target, float tau)
+critically damp to target in tau seconds (if the script is physical)
+	</string>
+	<string name="LSLTipText_llStopMoveToTarget">
+llStopMoveToTarget()
+Stops critically damped motion
+	</string>
+	<string name="LSLTipText_llApplyImpulse">
+llApplyImpulse(vector force, integer local)
+applies impulse to object, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llApplyRotationalImpulse">
+llApplyRotationalImpulse(vector force, integer local)
+applies rotational impulse to object, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetTorque">
+llSetTorque(vector torque, integer local)
+sets the torque of object, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llGetTorque">
+vector llGetTorque()
+gets the torque (if the script is physical)
+	</string>
+	<string name="LSLTipText_llSetForceAndTorque">
+llSetForceAndTorque(vector force, vector torque, integer local)
+sets the force and torque of object, in local coords if local == TRUE (if the script is physical)
+	</string>
+	<string name="LSLTipText_llGetVel">
+vector llGetVel()
+gets the velocity
+	</string>
+	<string name="LSLTipText_llGetAccel">
+vector llGetAccel()
+gets the acceleration
+	</string>
+	<string name="LSLTipText_llGetOmega">
+vector llGetOmega()
+gets the omega
+	</string>
+	<string name="LSLTipText_llGetTimeOfDay">
+float llGetTimeOfDay()
+gets the time in seconds since [SECOND_LIFE] server midnight (or since server up-time; whichever is smaller)
+	</string>
+	<string name="LSLTipText_llGetWallclock">
+float llGetWallclock()
+gets the time in seconds since midnight
+	</string>
+	<string name="LSLTipText_llGetTime">
+float llGetTime()
+gets the time in seconds since creation
+	</string>
+	<string name="LSLTipText_llResetTime">
+llResetTime()
+sets the time to zero
+	</string>
+	<string name="LSLTipText_llGetAndResetTime">
+float llGetAndResetTime()
+gets the time in seconds since creation and sets the time to zero
+	</string>
+	<string name="LSLTipText_llSound">
+llSound(string sound, float volume, integer queue, integer loop)
+plays sound at volume and whether it should loop or not
+	</string>
+	<string name="LSLTipText_llPlaySound">
+llPlaySound(string sound, float volume)
+plays attached sound once at volume (0.0 - 1.0)
+	</string>
+	<string name="LSLTipText_llLoopSound">
+llLoopSound(string sound, float volume)
+plays attached sound looping indefinitely at volume (0.0 - 1.0)
+	</string>
+	<string name="LSLTipText_llLoopSoundMaster">
+llLoopSoundMaster(string sound, float volume)
+plays attached sound looping at volume (0.0 - 1.0), declares it a sync master
+	</string>
+	<string name="LSLTipText_llLoopSoundSlave">
+llLoopSoundSlave(string sound, float volume)
+plays attached sound looping at volume (0.0 - 1.0), synced to most audible sync master
+	</string>
+	<string name="LSLTipText_llPlaySoundSlave">
+llPlaySoundSlave(string sound, float volume)
+plays attached sound once at volume (0.0 - 1.0), synced to next loop of most audible sync master
+	</string>
+	<string name="LSLTipText_llTriggerSound">
+llTriggerSound(string sound, float volume)
+plays sound at volume (0.0 - 1.0), centered at but not attached to object
+	</string>
+	<string name="LSLTipText_llStopSound">
+llStopSound()
+Stops currently attached sound
+	</string>
+	<string name="LSLTipText_llPreloadSound">
+llPreloadSound(string sound)
+preloads a sound on viewers within range
+	</string>
+	<string name="LSLTipText_llGetSubString">
+string llGetSubString(string src, integer start, integer end)
+returns the indicated substring
+	</string>
+	<string name="LSLTipText_llDeleteSubString">
+string llDeleteSubString(string src, integer start, integer end)
+removes the indicated substring and returns the result
+	</string>
+	<string name="LSLTipText_llInsertString">
+string llInsertString(string dst, integer position, string src)
+inserts src into dst at position and returns the result
+	</string>
+	<string name="LSLTipText_llToUpper">
+string llToUpper(string src)
+convert src to all upper case and returns the result
+	</string>
+	<string name="LSLTipText_llToLower">
+string llToLower(string src)
+convert src to all lower case and returns the result
+	</string>
+	<string name="LSLTipText_llGiveMoney">
+llGiveMoney(key destination, integer amount)
+transfer amount of money from script owner to destination
+	</string>
+	<string name="LSLTipText_llMakeExplosion">
+llMakeExplosion(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Make a round explosion of particles
+	</string>
+	<string name="LSLTipText_llMakeFountain">
+llMakeFountain(integer particles, float scale, float vel, float lifetime, float arc, integer bounce, string texture, vector offset, float bounce_offset)
+Make a fountain of particles
+	</string>
+	<string name="LSLTipText_llMakeSmoke">
+llMakeSmoke(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Make smoke like particles
+	</string>
+	<string name="LSLTipText_llMakeFire">
+llMakeFire(integer particles, float scale, float vel, float lifetime, float arc, string texture, vector offset)
+Make fire like particles
+	</string>
+	<string name="LSLTipText_llRezObject">
+llRezObject(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instanciate owners inventory object at pos with velocity vel and rotation rot with start parameter param
+	</string>
+	<string name="LSLTipText_llLookAt">
+llLookAt(vector target, F32 strength, F32 damping)
+Cause object name to point it&apos;s forward axis towards target
+	</string>
+	<string name="LSLTipText_llStopLookAt">
+llStopLookAt()
+Stop causing object name to point at a target
+	</string>
+	<string name="LSLTipText_llSetTimerEvent">
+llSetTimerEvent(float sec)
+Cause the timer event to be triggered every sec seconds
+	</string>
+	<string name="LSLTipText_llSleep">
+llSleep(float sec)
+Put script to sleep for sec seconds
+	</string>
+	<string name="LSLTipText_llGetMass">
+float llGetMass()
+Get the mass of task name that script is attached to
+	</string>
+	<string name="LSLTipText_llCollisionFilter">
+llCollisionFilter(string name, key id, integer accept)
+if accept == TRUE, only accept collisions with objects name and id (either is optional), otherwise with objects not name or id
+	</string>
+	<string name="LSLTipText_llTakeControls">
+llTakeControls(integer controls, integer accept, integer pass_on)
+Take controls from agent task has permissions for.  If (accept == (controls &amp; input)), send input to task.  If pass_on send to agent also.
+	</string>
+	<string name="LSLTipText_llReleaseControls">
+llReleaseControls()
+Stop taking inputs
+	</string>
+	<string name="LSLTipText_llAttachToAvatar">
+llAttachToAvatar(integer attachment)
+Attach to avatar task has permissions for at point attachment
+	</string>
+	<string name="LSLTipText_llDetachFromAvatar">
+llDetachFromAvatar()
+Drop off of avatar
+	</string>
+	<string name="LSLTipText_llTakeCamera">
+llTakeCamera(key avatar)
+Move avatar&apos;s viewpoint to task
+	</string>
+	<string name="LSLTipText_llReleaseCamera">
+llReleaseCamera(key avatar)
+Return camera to agent
+	</string>
+	<string name="LSLTipText_llGetOwner">
+key llGetOwner()
+Returns the owner of the task
+	</string>
+	<string name="LSLTipText_llInstantMessage">
+llInstantMessage(key user, string message)
+IMs message to the user
+	</string>
+	<string name="LSLTipText_llEmail">
+llEmail(string address, string subject, string message)
+Sends email to address with subject and message
+	</string>
+	<string name="LSLTipText_llGetNextEmail">
+llGetNextEmail(string address, string subject)
+Get the next waiting email with appropriate address and/or subject (if blank they are ignored)
+	</string>
+	<string name="LSLTipText_llGetKey">
+key llGetKey()
+Get the key for the task the script is attached to
+	</string>
+	<string name="LSLTipText_llSetBuoyancy">
+llSetBuoyancy(float buoyancy)
+Set the tasks buoyancy (0 is none, &lt; 1.0 sinks, 1.0 floats, > 1.0 rises)
+	</string>
+	<string name="LSLTipText_llSetHoverHeight">
+llSetHoverHeight(float height, integer water, float tau)
+Critically damps to a height (either above ground level or above the higher of land and water if water == TRUE)
+	</string>
+	<string name="LSLTipText_llStopHover">
+llStopHover()
+Stop hovering to a height
+	</string>
+	<string name="LSLTipText_llMinEventDelay">
+llMinEventDelay(float delay)
+Set the minimum time between events being handled
+	</string>
+	<string name="LSLTipText_llSoundPreload">
+llSoundPreload(string sound)
+preloads a sound on viewers within range
+	</string>
+	<string name="LSLTipText_llRotLookAt">
+llRotLookAt(rotation target, F32 strength, F32 damping)
+Cause object name to point it&apos;s forward axis towards target
+	</string>
+	<string name="LSLTipText_llStringLength">
+integer llStringLength(string str)
+Returns the length of string
+	</string>
+	<string name="LSLTipText_llStartAnimation">
+llStartAnimation(string anim)
+Start animation anim for agent that owns object
+	</string>
+	<string name="LSLTipText_llStopAnimation">
+llStopAnimation(string anim)
+Stop animation anim for agent that owns object
+	</string>
+	<string name="LSLTipText_llPointAt">
+llPointAt(vector pos)
+Make agent that owns object point at pos
+	</string>
+	<string name="LSLTipText_llStopPointAt">
+llStopPointAt()
+Stop agent that owns object pointing
+	</string>
+	<string name="LSLTipText_llTargetOmega">
+llTargetOmega(vector axis, float spinrate, float gain)
+Attempt to spin at spinrate with strength gain
+	</string>
+	<string name="LSLTipText_llGetStartParameter">
+integer llGetStartParameter()
+Get's the start paramter passed to llRezObject
+	</string>
+	<string name="LSLTipText_llGodLikeRezObject">
+llGodLikeRezObject(key inventory, vector pos)
+rez directly off of a UUID if owner has dog-bit set
+	</string>
+	<string name="LSLTipText_llRequestPermissions">
+llRequestPermissions(key agent, integer perm)
+ask agent to allow the script to do perm (NB: Debit, ownership, link, joint, and permission requests can only go to the task's owner)
+	</string>
+	<string name="LSLTipText_llGetPermissionsKey">
+key llGetPermissionsKey()
+Return agent that permissions are enabled for.  NULL_KEY if not enabled
+	</string>
+	<string name="LSLTipText_llGetPermissions">
+integer llGetPermissions()
+return what permissions have been enabled
+	</string>
+	<string name="LSLTipText_llGetLinkNumber">
+integer llGetLinkNumber()
+Returns what number in a link set the script is attached to (0 means no link, 1 the root, 2 for first child, etc)
+	</string>
+	<string name="LSLTipText_llSetLinkColor">
+llSetLinkColor(integer linknumber, vector color, integer face)
+If a task exists in the link chain at linknumber, set face to color
+	</string>
+	<string name="LSLTipText_llCreateLink">
+llCreateLink(key target, integer parent)
+Attempt to link task script is attached to and target (requires permission PERMISSION_CHANGE_LINKS be set). If parent == TRUE, task script is attached to is the root
+	</string>
+	<string name="LSLTipText_llBreakLink">
+llBreakLink(integer linknum)
+Delinks the task with the given link number (requires permission PERMISSION_CHANGE_LINKS be set)
+	</string>
+	<string name="LSLTipText_llBreakAllLinks">
+llBreakAllLinks()
+Delinks all tasks in the link set (requires permission PERMISSION_CHANGE_LINKS be set)
+	</string>
+	<string name="LSLTipText_llGetLinkKey">
+key llGetLinkKey(integer linknum)
+Get the key of linknumber in link set
+	</string>
+	<string name="LSLTipText_llGetLinkName">
+string llGetLinkName(integer linknum)
+Get the name of linknumber in link set
+	</string>
+	<string name="LSLTipText_llGetInventoryNumber">
+integer llGetInventoryNumber(integer type)
+Get the number of items of a given type in the task's inventory.
+Valid types: INVENTORY_TEXTURE, INVENTORY_SOUND, INVENTORY_OBJECT, INVENTORY_SCRIPT, INVENTORY_CLOTHING, INVENTORY_BODYPART, INVENTORY_NOTECARD, INVENTORY_LANDMARK, INVENTORY_ALL
+	</string>
+	<string name="LSLTipText_llGetInventoryName">
+string llGetInventoryName(integer type, integer number)
+Get the name of the inventory item number of type
+	</string>
+	<string name="LSLTipText_llSetScriptState">
+llSetScriptState(string name, integer run)
+Control the state of a script name.
+	</string>
+	<string name="LSLTipText_llGetEnergy">
+float llGetEnergy()
+Returns how much energy is in the object as a percentage of maximum
+	</string>
+	<string name="LSLTipText_llGiveInventory">
+llGiveInventory(key destination, string inventory)
+Give inventory to destination
+	</string>
+	<string name="LSLTipText_llRemoveInventory">
+llRemoveInventory(string inventory)
+Remove the named inventory item
+	</string>
+	<string name="LSLTipText_llSetText">
+llSetText(string text, vector color, float alpha)
+Set text floating over object
+	</string>
+	<string name="LSLTipText_llWater">
+float llWater(vector v)
+returns the water height below the object position + v
+	</string>
+	<string name="LSLTipText_llPassTouches">
+llPassTouches(integer pass)
+if pass == TRUE, touches are passed from children on to parents (default is FALSE)
+	</string>
+	<string name="LSLTipText_llRequestAgentData">
+key llRequestAgentData(key id, integer data)
+Requests data about agent id.  When data is available the dataserver event will be raised
+	</string>
+	<string name="LSLTipText_llRequestInventoryData">
+key llRequestInventoryData(string name)
+Requests data from object's inventory object.  When data is available the dataserver event will be raised
+	</string>
+	<string name="LSLTipText_llSetDamage">
+llSetDamage(float damage)
+Sets the amount of damage that will be done to an object that this task hits.  Task will be killed.
+	</string>
+	<string name="LSLTipText_llTeleportAgentHome">
+llTeleportAgentHome(key id)
+Teleports agent on owner's land to agent's home location
+	</string>
+	<string name="LSLTipText_llModifyLand">
+llModifyLand(integer action, integer size)
+Modify land with action (LAND_LEVEL, LAND_RAISE, LAND_LOWER, LAND_SMOOTH, LAND_NOISE, LAND_REVERT)
+on size (LAND_SMALL_BRUSH, LAND_MEDIUM_BRUSH, LAND_LARGE_BRUSH)
+	</string>
+	<string name="LSLTipText_llCollisionSound">
+llCollisionSound(string impact_sound, float impact_volume)
+Suppress default collision sounds, replace default impact sounds with impact_sound (empty string to just suppress)
+	</string>
+	<string name="LSLTipText_llCollisionSprite">
+llCollisionSprite(string impact_sprite)
+Suppress default collision sprites, replace default impact sprite with impact_sprite (empty string to just suppress)
+	</string>
+	<string name="LSLTipText_llGetAnimation">
+string llGetAnimation(key id)
+Get the currently playing locomotion animation for avatar id
+	</string>
+	<string name="LSLTipText_llResetScript">
+llResetScript()
+Resets the script
+	</string>
+	<string name="LSLTipText_llMessageLinked">
+llMessageLinked(integer linknum, integer num, string str, key id)
+Sends num, str, and id to members of the link set
+(LINK_ROOT sends to root task in a linked set,
+LINK_SET sends to all tasks,
+LINK_ALL_OTHERS to all other tasks,
+LINK_ALL_CHILDREN to all children,
+LINK_THIS to the task the script it is in)
+	</string>
+	<string name="LSLTipText_llPushObject">
+llPushObject(key id, vector impulse, vector ang_impulse, integer local)
+Applies impulse and ang_impulse to object id
+	</string>
+	<string name="LSLTipText_llPassCollisions">
+llPassCollisions(integer pass)
+if pass == TRUE, collisions are passed from children on to parents (default is FALSE)
+	</string>
+	<string name="LSLTipText_llGetScriptName">
+llGetScriptName()
+Returns the script name
+	</string>
+	<string name="LSLTipText_llGetNumberOfSides">
+integer llGetNumberOfSides()
+Returns the number of sides
+	</string>
+	<string name="LSLTipText_llAxisAngle2Rot">
+rotation llAxisAngle2Rot(vector axis, float angle)
+Returns the rotation generated angle about axis
+	</string>
+	<string name="LSLTipText_llRot2Axis">
+vector llRot2Axis(rotation rot)
+Returns the rotation axis represented by rot
+	</string>
+	<string name="LSLTipText_llRot2Angle">
+float llRot2Angle(rotation rot)
+Returns the rotation angle represented by rot
+	</string>
+	<string name="LSLTipText_llAcos">
+float llAcos(float val)
+Returns the arccosine in radians of val
+	</string>
+	<string name="LSLTipText_llAsin">
+float llAsin(float val)
+Returns the arcsine in radians of val
+	</string>
+	<string name="LSLTipText_llAngleBetween">
+float llAngleBetween(rotation a, rotation b)
+Returns angle between rotation a and b
+	</string>
+	<string name="LSLTipText_llGetInventoryKey">
+key llGetInventoryKey(string name)
+Returns the key of the inventory name
+	</string>
+	<string name="LSLTipText_llAllowInventoryDrop">
+llAllowInventoryDrop(integer add)
+If add == TRUE, users without permissions can still drop inventory items onto task
+	</string>
+	<string name="LSLTipText_llGetSunDirection">
+vector llGetSunDirection()
+Returns the sun direction on the simulator
+	</string>
+	<string name="LSLTipText_llGetTextureOffset">
+vector llGetTextureOffset(integer side)
+Returns the texture offset of side in the x and y components of a vector
+	</string>
+	<string name="LSLTipText_llGetTextureScale">
+vector llGetTextureScale(integer side)
+Returns the texture scale of side in the x and y components of a vector
+	</string>
+	<string name="LSLTipText_llGetTextureRot">
+float llGetTextureRot(integer side)
+Returns the texture rotation of side
+	</string>
+	<string name="LSLTipText_llSubStringIndex">
+integer llSubStringIndex(string source, string pattern)
+Finds index in source where pattern first appears (returns -1 if not found)
+	</string>
+	<string name="LSLTipText_llGetOwnerKey">
+key llGetOwnerKey(key id)
+Find the owner of id
+	</string>
+	<string name="LSLTipText_llGetCenterOfMass">
+vector llGetCenterOfMass()
+Get the object's center of mass
+	</string>
+	<string name="LSLTipText_llListSort">
+list llListSort(list src, integer stride, integer ascending)
+Sort the list into blocks of stride in ascending order if ascending == TRUE.  Note that sort only works between same types.
+	</string>
+	<string name="LSLTipText_llGetListLength">
+integer llGetListLength(list src)
+Get the number of elements in the list
+	</string>
+	<string name="LSLTipText_llList2Integer">
+integer llList2Integer(list src, integer index)
+Copy the integer at index in the list
+	</string>
+	<string name="LSLTipText_llList2Float">
+float llList2Float(list src, integer index)
+Copy the float at index in the list
+	</string>
+	<string name="LSLTipText_llList2String">
+string llList2String(list src, integer index)
+Copy the string at index in the list
+	</string>
+	<string name="LSLTipText_llList2Key">
+key llList2Key(list src, integer index)
+Copy the key at index in the list
+	</string>
+	<string name="LSLTipText_llList2Vector">
+vector llList2Vector(list src, integer index)
+Copy the vector at index in the list
+	</string>
+	<string name="LSLTipText_llList2Rot">
+rotation llList2Rot(list src, integer index)
+Copy the rotation at index in the list
+	</string>
+	<string name="LSLTipText_llList2List">
+list llList2List(list src, integer start, integer end)
+Copy the slice of the list from start to end
+	</string>
+	<string name="LSLTipText_llDeleteSubList">
+list llDeleteSubList(list src, integer start, integer end)
+Remove the slice from the list and return the remainder
+	</string>
+	<string name="LSLTipText_llGetListEntryType">
+integer llGetListEntryType(list src, integer index)
+Returns the type of the index entry in the list
+(TYPE_INTEGER, TYPE_FLOAT, TYPE_STRING, TYPE_KEY, TYPE_VECTOR, TYPE_ROTATION, or TYPE_INVALID if index is off list)
+	</string>
+	<string name="LSLTipText_llList2CSV">
+string llList2CSV(list src)
+Create a string of comma separated values from list
+	</string>
+	<string name="LSLTipText_llCSV2List">
+list llCSV2List(string src)
+Create a list from a string of comma separated values
+	</string>
+	<string name="LSLTipText_llListRandomize">
+list llListRandomize(list src, integer stride)
+Returns a randomized list of blocks of size stride
+	</string>
+	<string name="LSLTipText_llList2ListStrided">
+list llList2ListStrided(list src, integer start, integer end, integer stride)
+Copy the strided slice of the list from start to end
+	</string>
+	<string name="LSLTipText_llGetRegionCorner">
+vector llGetRegionCorner()
+Returns a vector with the south west corner x,y position of the region the object is in
+	</string>
+	<string name="LSLTipText_llListInsertList">
+list llListInsertList(list dest, list src, integer start)
+Inserts src into dest at position start
+	</string>
+	<string name="LSLTipText_llListFindList">
+integer llListFindList(list src, list test)
+Returns the start of the first instance of test in src, -1 if not found
+	</string>
+	<string name="LSLTipText_llGetObjectName">
+string llGetObjectName()
+Returns the name of the object script is attached to
+	</string>
+	<string name="LSLTipText_llSetObjectName">
+llSetObjectName(string name)
+Sets the objects name
+	</string>
+	<string name="LSLTipText_llGetDate">
+string llGetDate()
+Gets the date as YYYY-MM-DD
+	</string>
+	<string name="LSLTipText_llEdgeOfWorld">
+integer llEdgeOfWorld(vector pos, vector dir)
+Checks to see whether the border hit by dir from pos is the edge of the world (has no neighboring simulator)
+	</string>
+	<string name="LSLTipText_llGetAgentInfo">
+integer llGetAgentInfo(key id)
+Gets information about agent ID.
+Returns AGENT_FLYING, AGENT_ATTACHMENTS, AGENT_SCRIPTED, AGENT_SITTING, AGENT_ON_OBJECT, AGENT_MOUSELOOK, AGENT_AWAY, AGENT_BUSY, AGENT_TYPING, AGENT_CROUCHING, AGENT_ALWAYS_RUN, AGENT_WALKING and/or AGENT_IN_AIR.
+	</string>
+	<string name="LSLTipText_llAdjustSoundVolume">
+llAdjustSoundVolume(float volume)
+adjusts volume of attached sound (0.0 - 1.0)
+	</string>
+	<string name="LSLTipText_llSetSoundQueueing">
+llSetSoundQueueing(integer queue)
+determines whether attached sound calls wait for the current sound to finish (0 = no [default], nonzero = yes)
+	</string>
+	<string name="LSLTipText_llSetSoundRadius">
+llSetSoundRadius(float radius)
+establishes a hard cut-off radius for audibility of scripted sounds (both attached and triggered)
+	</string>
+	<string name="LSLTipText_llKey2Name">
+string llKey2Name(key id)
+Returns the name of the object key, iff the object is in the current simulator, otherwise the empty string
+	</string>
+	<string name="LSLTipText_llSetTextureAnim">
+llSetTextureAnim(integer mode, integer face, integer sizex, integer sizey, float start, float length, float rate)
+Animate the texture on the specified face/faces
+	</string>
+	<string name="LSLTipText_llTriggerSoundLimited">
+llTriggerSoundLimited(string sound, float volume, vector tne, vector bsw)
+plays sound at volume (0.0 - 1.0), centered at but not attached to object, limited to AABB defined by vectors top-north-east and bottom-south-west
+	</string>
+	<string name="LSLTipText_llEjectFromLand">
+llEjectFromLand(key pest)
+Ejects pest from land that you own
+	</string>
+	<string name="LSLTipText_llParseString2List">
+list llParseString2List(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each)
+	</string>
+	<string name="LSLTipText_llOverMyLand">
+integer llOverMyLand(key id)
+Returns TRUE if id is over land owner of object owns, FALSE otherwise
+	</string>
+	<string name="LSLTipText_llGetLandOwnerAt">
+key llGetLandOwnerAt(vector pos)
+Returns the key of the land owner, NULL_KEY if public
+	</string>
+	<string name="LSLTipText_llGetNotecardLine">
+key llGetNotecardLine(string name, integer line)
+Returns line line of notecard name via the dataserver event
+	</string>
+	<string name="LSLTipText_llGetAgentSize">
+vector llGetAgentSize(key id)
+If the agent is in the same sim as the object, returns the size of the avatar
+	</string>
+	<string name="LSLTipText_llSameGroup">
+integer llSameGroup(key id)
+Returns TRUE if ID is in the same sim and has the same active group, otherwise FALSE
+	</string>
+	<string name="LSLTipText_llUnSit">
+key llUnSit(key id)
+If agent identified by id is sitting on the object the script is attached to or is over land owned by the objects owner, the agent is forced to stand up
+	</string>
+	<string name="LSLTipText_llGroundSlope">
+vector llGroundSlope(vector v)
+returns the ground slope below the object position + v
+	</string>
+	<string name="LSLTipText_llGroundNormal">
+vector llGroundNormal(vector v)
+returns the ground normal below the object position + v
+	</string>
+	<string name="LSLTipText_llGroundContour">
+vector llGroundCountour(vector v)
+returns the ground contour below the object position + v
+	</string>
+	<string name="LSLTipText_llGetAttached">
+integer llGetAttached()
+returns the object attachment point or 0 if not attached
+	</string>
+	<string name="LSLTipText_llGetFreeMemory">
+integer llGetFreeMemory()
+returns the available heap space for the current script
+	</string>
+	<string name="LSLTipText_llGetRegionName">
+string llGetRegionName()
+returns the current region name
+	</string>
+	<string name="LSLTipText_llGetRegionTimeDilation">
+float llGetRegionTimeDilation()
+returns the current time dilation as a float between 0 and 1
+	</string>
+	<string name="LSLTipText_llGetRegionFPS">
+float llGetRegionFPS()
+returns the mean region frames per second
+	</string>
+	<string name="LSLTipText_llParticleSystem">
+llParticleSystem(list rules)
+Creates a particle system based on rules.  Empty list removes particle system from object.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+	</string>
+	<string name="LSLTipText_llGroundRepel">
+llGroundRepel(float height, integer water, float tau)
+Critically damps to height if within height*0.5 of level (either above ground level or above the higher of land and water if water == TRUE)
+	</string>
+	<string name="LSLTipText_llGiveInventoryList">
+llGiveInventoryList(key destination, string category, list inventory)
+Give inventory to destination in a new category
+	</string>
+	<string name="LSLTipText_llSetVehicleType">
+llSetVehicleType(integer type)
+sets vehicle to one of the default types
+	</string>
+	<string name="LSLTipText_llSetVehicleFloatParam">
+llSetVehicleFloatParam(integer param, float value)
+sets the specified vehicle float parameter
+	</string>
+	<string name="LSLTipText_llSetVehicleVectorParam">
+llSetVehicleVectorParam(integer param, vector vec)
+sets the specified vehicle vector parameter
+	</string>
+	<string name="LSLTipText_llSetVehicleRotationParam">
+llSetVehicleVectorParam(integer param, rotation rot)
+sets the specified vehicle rotation parameter
+	</string>
+	<string name="LSLTipText_llSetVehicleFlags">
+llSetVehicleFlags(integer flags)
+sets the enabled bits in 'flags'
+	</string>
+	<string name="LSLTipText_llRemoveVehicleFlags">
+llRemoveVehicleFlags(integer flags)
+removes the enabled bits in 'flags'
+	</string>
+	<string name="LSLTipText_llSitTarget">
+llSitTarget(vector offset, rotation rot)
+Set the sit location for this object (if offset == &lt;0,0,0&gt; clear it)
+	</string>
+	<string name="LSLTipText_llAvatarOnSitTarget">
+key llAvatarOnSitTarget()
+If an avatar is sitting on the sit target, return the avatar's key, NULL_KEY otherwise
+	</string>
+	<string name="LSLTipText_llAddToLandPassList">
+llAddToLandPassList(key avatar, float hours)
+Add avatar to the land pass list for hours
+	</string>
+	<string name="LSLTipText_llSetTouchText">
+llSetTouchText(string text)
+Displays text in pie menu that acts as a touch
+	</string>
+	<string name="LSLTipText_llSetSitText">
+llSetSitText(string text)
+Displays text rather than sit in pie menu
+	</string>
+	<string name="LSLTipText_llSetCameraEyeOffset">
+llSetCameraEyeOffset(vector offset)
+Sets the camera eye offset used in this object if an avatar sits on it
+	</string>
+	<string name="LSLTipText_llSetCameraAtOffset">
+llSetCameraAtOffset(vector offset)
+Sets the camera at offset used in this object if an avatar sits on it
+	</string>
+	<string name="LSLTipText_llDumpList2String">
+string llDumpList2String(list src, string separator)
+Write the list out in a single string using separator between values
+	</string>
+	<string name="LSLTipText_llScriptDanger">
+integer llScriptDanger(vector pos)
+Returns true if pos is over public land, sandbox land, land that doesn't allow everyone to edit and build, or land that doesn't allow outside scripts
+	</string>
+	<string name="LSLTipText_llDialog">
+llDialog(key avatar, string message, list buttons, integer chat_channel
+Shows a dialog box on the avatar's screen with the message.
+Up to 12 strings in the list form buttons.
+If a button is clicked, the name is chatted on chat_channel.
+	</string>
+	<string name="LSLTipText_llVolumeDetect">
+llVolumeDetect(integer detect)
+If detect = TRUE, object becomes phantom but triggers collision_start and collision_end events when other objects start and stop interpenetrating.
+Must be applied to the root object.
+	</string>
+	<string name="LSLTipText_llResetOtherScript">
+llResetOtherScript(string name)
+Resets script name
+	</string>
+	<string name="LSLTipText_llGetScriptState">
+integer llGetScriptState(string name)
+Resets TRUE if script name is running
+	</string>
+	<string name="LSLTipText_llRemoteLoadScript">
+Deprecated.  Please use llRemoteLoadScriptPin instead.
+	</string>
+	<string name="LSLTipText_llSetRemoteScriptAccessPin">
+llSetRemoteScriptAccessPin(integer pin)
+If pin is set to a non-zero number, the task will accept remote script loads via llRemoteLoadScriptPin if it passes in the correct pin.
+Othersise, llRemoteLoadScriptPin is ignored.
+	</string>
+	<string name="LSLTipText_llRemoteLoadScriptPin">
+llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)
+If the owner of the object this script is attached can modify target, 
+they are in the same region, and the matching pin is used,
+copy script name onto target,
+if running == TRUE, start the script with param.
+	</string>
+	<string name="LSLTipText_llOpenRemoteDataChannel">
+llOpenRemoteDataChannel()
+Creates a channel to listen for XML-RPC calls.  Will trigger a remote_data event with channel id once it is available.
+	</string>
+	<string name="LSLTipText_llSendRemoteData">
+key llSendRemoteData(key channel, string dest, integer idata, string sdata)
+Send an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.
+A message identifier key is returned.
+An XML-RPC reply will trigger a remote_data event and reference the message id.
+The message_id is returned.
+	</string>
+	<string name="LSLTipText_llRemoteDataReply">
+llRemoteDataReply(key channel, key message_id, string sdata, integer idata)
+Send an XML-RPC reply to message_id on channel with payload of string sdata and integer idata
+	</string>
+	<string name="LSLTipText_llCloseRemoteDataChannel">
+llCloseRemoteDataChannel(key channel)
+Closes XML-RPC channel.
+	</string>
+	<string name="LSLTipText_llMD5String">
+string llMD5String(string src, integer nonce)
+Performs a RSA Data Security, Inc. MD5 Message-Digest Algorithm on string with nonce.  Returns a 32 character hex string.
+	</string>
+	<string name="LSLTipText_llSetPrimitiveParams">
+llSetPrimitiveParams(list rules)
+Set primitive parameters based on rules.
+	</string>
+	<string name="LSLTipText_llStringToBase64">
+string llStringToBase64(string str)
+Converts a string to the Base 64 representation of the string.
+	</string>
+	<string name="LSLTipText_llBase64ToString">
+string llBase64ToString(string str)
+Converts a Base 64 string to a conventional string.  If the conversion creates any unprintable characters, they are converted to spaces.
+	</string>
+	<string name="LSLTipText_llXorBase64Strings">
+string llXorBase64Strings(string s1, string s2)
+DEPRECATED!  Please use llXorBase64StringsCorrect instead!!  Incorrectly performs an exclusive or on two Base 64 strings and returns a Base 64 string.  s2 repeats if it is shorter than s1.  Retained for backwards compatability.
+	</string>
+	<string name="LSLTipText_llRemoteDataSetRegion">
+llRemoteDataSetRegion()
+If an object using remote data channels changes regions, you must call this function to reregister the remote data channels.
+You do not need to make this call if you don't change regions.
+	</string>
+	<string name="LSLTipText_llLog10">
+float llLog10(float val)
+Returns the base 10 log of val if val &gt; 0, otherwise returns 0.
+	</string>
+	<string name="LSLTipText_llLog">
+float llLog(float val)
+Returns the base e log of val if val &gt; 0, otherwise returns 0.
+	</string>
+	<string name="LSLTipText_llGetAnimationList">
+list llGetAnimationList(key id)
+Gets a list of all playing animations for avatar id
+	</string>
+	<string name="LSLTipText_llSetParcelMusicURL">
+llSetParcelMusicURL(string url)
+Sets the streaming audio URL for the parcel object is on
+	</string>
+	<string name="LSLTipText_llGetRootPosition">
+vector llGetRootPosition()
+Gets the global position of the root object of the object script is attached to
+	</string>
+	<string name="LSLTipText_llGetRootRotation">
+rotation llGetRootRotation()
+Gets the global rotation of the root object of the object script is attached to
+	</string>
+	<string name="LSLTipText_llGetObjectDesc">
+string llGetObjectDesc()
+Returns the description of the object the script is attached to
+	</string>
+	<string name="LSLTipText_llSetObjectDesc">
+llSetObjectDesc(string name)
+Sets the object's description
+	</string>
+	<string name="LSLTipText_llGetCreator">
+key llGetCreator()
+Returns the creator of the object
+	</string>
+	<string name="LSLTipText_llGetTimestamp">
+string llGetTimestamp()
+Gets the timestamp in the format: YYYY-MM-DDThh:mm:ss.ff..fZ
+	</string>
+	<string name="LSLTipText_llSetLinkAlpha">
+llSetLinkAlpha(integer linknumber, float alpha, integer face)
+If a prim exists in the link chain at linknumber, set face to alpha
+	</string>
+	<string name="LSLTipText_llGetNumberOfPrims">
+integer llGetNumberOfPrims()
+Returns the number of prims in a link set the script is attached to
+	</string>
+	<string name="LSLTipText_llGetNumberOfNotecardLines">
+key llGetNumberOfNotecardLines(string name)
+Returns number of lines in notecard 'name' via the dataserver event (cast return value to integer)
+	</string>
+	<string name="LSLTipText_llGetBoundingBox">
+list llGetBoundingBox(key object)
+Returns the bounding box around an object (including any linked prims) relative to the root prim, in a list:  [ (vector) min_corner, (vector) max_corner ]
+	</string>
+	<string name="LSLTipText_llGetGeometricCenter">
+vector llGetGeometricCenter()
+Returns the geometric center of the linked set the script is attached to.
+	</string>
+	<string name="LSLTipText_llGetPrimitiveParams">
+list llGetPrimitiveParams(list params)
+Gets primitive parameters specified in the params list.
+	</string>
+	<string name="LSLTipText_llIntegerToBase64">
+string llIntegerToBase64(integer number)
+Big endian encode of of integer as a Base64 string.
+	</string>
+	<string name="LSLTipText_llBase64ToInteger">
+integer llBase64ToInteger(string str)
+Big endian decode of a Base64 string into an integer.
+	</string>
+	<string name="LSLTipText_llGetGMTclock">
+float llGetGMTclock()
+Gets the time in seconds since midnight in GMT
+	</string>
+	<string name="LSLTipText_llGetSimulatorHostname">
+string llGetSimulatorHostname()
+Gets the hostname of the machine script is running on (same as string in viewer Help dialog)
+	</string>
+	<string name="LSLTipText_llSetLocalRot">
+llSetLocalRot(rotation rot)
+sets the rotation of a child prim relative to the root prim
+	</string>
+	<string name="LSLTipText_llParseStringKeepNulls">
+list llParseStringKeepNulls(string src, list separators, list spacers)
+Breaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each), keeping any null values generated.
+	</string>
+	<string name="LSLTipText_llRezAtRoot">
+llRezAtRoot(string inventory, vector pos, vector vel, rotation rot, integer param)
+Instantiate owner's inventory object at pos with velocity vel and rotation rot with start parameter param.
+The last selected root object's location will be set to pos
+	</string>
+	<string name="LSLTipText_llGetObjectPermMask">
+integer llGetObjectPermMask(integer mask)
+Returns the requested permission mask for the root object the task is attached to.
+	</string>
+	<string name="LSLTipText_llSetObjectPermMask">
+llSetObjectPermMask(integer mask, integer value)
+Sets the given permission mask to the new value on the root object the task is attached to.
+	</string>
+	<string name="LSLTipText_llGetInventoryPermMask">
+integer llGetInventoryPermMask(string item, integer mask)
+Returns the requested permission mask for the inventory item.
+	</string>
+	<string name="LSLTipText_llSetInventoryPermMask">
+llSetInventoryPermMask(string item, integer mask, integer value)
+Sets the given permission mask to the new value on the inventory item.
+	</string>
+	<string name="LSLTipText_llGetInventoryCreator">
+key llGetInventoryCreator(string item)
+Returns the key for the creator of the inventory item.
+	</string>
+	<string name="LSLTipText_llOwnerSay">
+llOwnerSay(string msg)
+says msg to owner only (if owner in sim)
+	</string>
+	<string name="LSLTipText_llRequestSimulatorData">
+key llRequestSimulatorData(string simulator, integer data)
+Requests data about simulator.  When data is available the dataserver event will be raised
+	</string>
+	<string name="LSLTipText_llForceMouselook">
+llForceMouselook(integer mouselook)
+If mouselook is TRUE any avatar that sits on this object is forced into mouselook mode
+	</string>
+	<string name="LSLTipText_llGetObjectMass">
+float llGetObjectMass(key id)
+Get the mass of the object with key id
+	</string>
+	<string name="LSLTipText_llListReplaceList">
+list llListReplaceList(list dest, list src, integer start, integer end)
+Replaces start through end of dest with src.
+	</string>
+	<string name="LSLTipText_llLoadURL">
+llLoadURL(key avatar_id, string message, string url)
+Shows dialog to avatar avatar_id offering to load web page at URL.  If user clicks yes, launches their web browser.
+	</string>
+	<string name="LSLTipText_llParcelMediaCommandList">
+llParcelMediaCommandList(list command)
+Sends a list of commands, some with arguments, to a parcel.
+	</string>
+	<string name="LSLTipText_llParcelMediaQuery">
+list llParcelMediaQuery(list query)
+Sends a list of queries, returns a list of results.
+	</string>
+	<string name="LSLTipText_llModPow">
+integer llModPow(integer a, integer b, integer c)
+Returns a raised to the b power, mod c. ( (a**b)%c ).  b is capped at 0xFFFF (16 bits).
+	</string>
+	<string name="LSLTipText_llGetInventoryType">
+integer llGetInventoryType(string name)
+Returns the type of the inventory name
+	</string>
+	<string name="LSLTipText_llSetPayPrice">
+llSetPayPrice(integer price, list quick_pay_buttons)
+Sets the default amount when someone chooses to pay this object.
+	</string>
+	<string name="LSLTipText_llGetCameraPos">
+vector llGetCameraPos()
+Gets current camera position for agent task has permissions for.
+	</string>
+	<string name="LSLTipText_llGetCameraRot">
+rotation llGetCameraRot()
+Gets current camera orientation for agent task has permissions for.
+	</string>
+	<string name="LSLTipText_llSetPrimURL">
+llSetPrimURL(string url)
+Updates the URL for the web page shown on the sides of the object.
+	</string>
+	<string name="LSLTipText_llRefreshPrimURL">
+llRefreshPrimURL()
+Reloads the web page shown on the sides of the object.
+	</string>
+	<string name="LSLTipText_llEscapeURL">
+string llEscapeURL(string url)
+Returns and escaped/encoded version of url, replacing spaces with %20 etc.
+	</string>
+	<string name="LSLTipText_llUnescapeURL">
+string llUnescapeURL(string url)
+Returns and unescaped/unencoded version of url, replacing %20 with spaces etc.
+	</string>
+	<string name="LSLTipText_llMapDestination">
+llMapDestination(string simname, vector pos, vector look_at)
+Opens world map centered on region with pos highlighted.
+Only works for scripts attached to avatar, or during touch events.
+(NOTE: look_at currently does nothing)
+	</string>
+	<string name="LSLTipText_llAddToLandBanList">
+llAddToLandBanList(key avatar, float hours)
+Add avatar to the land ban list for hours
+	</string>
+	<string name="LSLTipText_llRemoveFromLandPassList">
+llRemoveFromLandPassList(key avatar)
+Remove avatar from the land pass list
+	</string>
+	<string name="LSLTipText_llRemoveFromLandBanList">
+llRemoveFromLandBanList(key avatar)
+Remove avatar from the land ban list
+	</string>
+	<string name="LSLTipText_llSetCameraParams">
+llSetCameraParams(list rules)
+Sets multiple camera parameters at once.
+List format is [ rule1, data1, rule2, data2 . . . rulen, datan ]
+	</string>
+	<string name="LSLTipText_llClearCameraParams">
+llClearCameraParams()
+Resets all camera parameters to default values and turns off scripted camera control.
+	</string>
+	<string name="LSLTipText_llListStatistics">
+float llListStatistics(integer operation, list l)
+Perform statistical aggregate functions on list l using LIST_STAT_* operations.
+	</string>
+	<string name="LSLTipText_llGetUnixTime">
+integer llGetUnixTime()
+Get the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock.
+	</string>
+	<string name="LSLTipText_llGetParcelFlags">
+integer llGetParcelFlags(vector pos)
+Get the parcel flags (PARCEL_FLAG_*) for the parcel including the point pos.
+	</string>
+	<string name="LSLTipText_llGetRegionFlags">
+integer llGetRegionFlags()
+Get the region flags (REGION_FLAG_*) for the region the object is in.
+	</string>
+	<string name="LSLTipText_llXorBase64StringsCorrect">
+string llXorBase64StringsCorrect(string s1, string s2)
+Correctly performs an exclusive or on two Base 64 strings and returns a Base 64 string.  s2 repeats if it is shorter than s1.
+	</string>
+	<string name="LSLTipText_llHTTPRequest">
+llHTTPRequest(string url, list parameters, string body)
+Send an HTTP request.
+	</string>
+	<string name="LSLTipText_llResetLandBanList">
+llResetLandBanList()
+Removes all residents from the land ban list.
+	</string>
+	<string name="LSLTipText_llResetLandPassList">
+llResetLandPassList()
+Removes all residents from the land access/pass list.
+	</string>
+	<string name="LSLTipText_llGetObjectPrimCount">
+integer llGetObjectPrimCount(key object_id)
+Returns the total number of prims for an object.
+	</string>
+	<string name="LSLTipText_llGetParcelPrimOwners">
+list llGetParcelPrimOwners(vector pos)
+Returns a list of all residents who own objects on the parcel and the number of objects they own.
+Requires owner-like permissions for the parcel.
+	</string>
+	<string name="LSLTipText_llGetParcelPrimCount">
+integer llGetParcelPrimCount(vector pos, integer category, integer sim_wide)
+Gets the number of prims on the parcel of the given category.
+Categories: PARCEL_COUNT_TOTAL, _OWNER, _GROUP, _OTHER, _SELECTED, _TEMP.
+	</string>
+	<string name="LSLTipText_llGetParcelMaxPrims">
+integer llGetParcelMaxPrims(vector pos, integer sim_wide)
+Gets the maximum number of prims allowed on the parcel at pos.
+	</string>
+	<string name="LSLTipText_llGetParcelDetails">
+list llGetParcelDetails(vector pos, list params)
+Gets the parcel details specified in params for the parcel at pos.
+Params is one or more of: PARCEL_DETAILS_NAME, _DESC, _OWNER, _GROUP, _AREA
+	</string>
+	<string name="LSLTipText_llSetLinkPrimitiveParams">
+llSetLinkPrimitiveParams(integer linknumber, list rules)
+Set primitive parameters for linknumber based on rules.
+	</string>
+	<string name="LSLTipText_llSetLinkTexture">
+llSetLinkTexture(integer link_pos, string texture, integer face)
+Sets the texture of face for link_pos
+	</string>
+	<string name="LSLTipText_llStringTrim">
+string llStringTrim(string src, integer trim_type)
+Trim leading and/or trailing spaces from a string.
+Uses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL.
+	</string>
+	<string name="LSLTipText_llRegionSay">
+llRegionSay(integer channel, string msg)
+broadcasts msg to entire region on channel (not 0.)
+	</string>
+	<string name="LSLTipText_llGetObjectDetails">
+list llGetObjectDetails(key id, list params)
+Gets the object details specified in params for the object with key id.
+Details are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR.
+	</string>
+	<string name="LSLTipText_llSetClickAction">
+llSetClickAction(integer action)
+Sets the action performed when a prim is clicked upon.
+	</string>
+	<string name="LSLTipText_llGetRegionAgentCount">
+int llGetRegionAgentCount()
+returns the number of agents in a region
+	</string>
+	<string name="LSLTipText_llTextBox">
+llTextBox(key avatar, string message, integer chat_channel
+Shows a dialog box on the avatar's screen with the message.
+A text box asks for input, and if entered the text is chatted on chat_channel.
+	</string>
+	<string name="LSLTipText_llGetAgentLanguage">
+string llGetAgentLanguage(key id)
+Gets the agents preferred language..
+	</string>
+	<string name="LSLTipText_llDetectedTouchUV">
+vector llDetectedTouchUV(integer number)
+returns the u and v coordinates in the first two components of a vector, for a triggered touch event
+	</string>
+	<string name="LSLTipText_llDetectedTouchFace">
+integer llDetectedTouchFace(integer number)
+returns the index of the face on the object for a triggered touch event
+	</string>
+	<string name="LSLTipText_llDetectedTouchPos">
+vector llDetectedTouchPos(integer number)
+returns the position touched for a triggered touch event
+	</string>
+	<string name="LSLTipText_llDetectedTouchNormal">
+vector llDetectedTouchNormal(integer number)
+returns the surface normal for a triggered touch event
+	</string>
+	<string name="LSLTipText_llDetectedTouchBinormal">
+vector llDetectedTouchBinormal(integer number)
+returns the surface binormal for a triggered touch event
+	</string>
+	<string name="LSLTipText_llDetectedTouchST">
+vector llDetectedTouchST(integer number)
+returns the s and t coordinates in the first two components of a vector, for a triggered touch event
+	</string>
+	<string name="LSLTipText_llSHA1String">
+string llSHA1String(string sr)
+Performs a SHA1 security Hash.  Returns a 40 character hex string.
+	</string>
+	<string name="LSLTipText_llGetFreeURLs">
+integer llGetFreeURLs()
+returns the available urls for the current script
+	</string>
+	<string name="LSLTipText_llRequestURL">
+key llRequestURL()
+Requests one HTTP:// url for use by this object
+Triggers an http_server event with results.
+	</string>
+	<string name="LSLTipText_llRequestSecureURL">
+key llRequestSecureURL()
+Requests one HTTPS:// (SSL) url for use by this object
+Triggers an http_server event with results.
+	</string>
+	<string name="LSLTipText_llReleaseURL">
+llReleaseURL(string url)
+Releases the specified URL, it will no longer be usable.
+	</string>
+	<string name="LSLTipText_llHTTPResponse">
+llHTTPResponse(key id, integer status, string body)
+Responds to request id with status and body.
+	</string>
+	<string name="LSLTipText_llGetHTTPHeader">
+string llGetHTTPHeader(key id, string header)
+Get the value for header for request id.
+	</string>
 	
 	<!-- Avatar busy/away mode -->
 	<string name="AvatarSetNotAway">Set Not Away</string>
-- 
cgit v1.2.3


From f03db936f892c8b8e58182a90afd4adba2482bdc Mon Sep 17 00:00:00 2001
From: Ramzi Ramey <ramzi@lindenlab.com>
Date: Thu, 3 Sep 2009 23:53:47 +0000
Subject: DEV-39252 add 3 missing name= elements in the EN xui. This breaks
 localization.

---
 indra/newview/skins/default/xui/en/floater_tools.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index 51e4d15e5d..a126a932df 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -1003,12 +1003,15 @@
             name="sale type"
             intial_value="2">
         <combo_item
+           name="Copy"
            label="Copy" 
            value="2" />
         <combo_item
+           name="Contents"
            label="Contents"  
            value="3" />
         <combo_item
+           name="Original"
            label="Original" 
            value="1" />
       </combo_box>
-- 
cgit v1.2.3


From 2273376dffb80af0cbf1bc1d8cc8990e1d1456f3 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 4 Sep 2009 00:16:51 +0000
Subject: DEV-39441 - Eliminate boost:regexp from LLString::format Also removed
 a missing setting (merge bug)

---
 indra/newview/skins/default/xui/en/notifications.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 3c66f99e6a..8b20918700 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5029,7 +5029,7 @@ You must have payment information on file to visit this area.  Do you want to go
    icon="alertmodal.tga"
    name="MissingString"
    type="alertmodal">
-How odd. The string [STRING_NAME] is missing from strings.xml
+The string [STRING_NAME] is missing from strings.xml
   </notification>
 
   <notification
-- 
cgit v1.2.3


From 330840af7c363accc8e12d073ba91b871c578d27 Mon Sep 17 00:00:00 2001
From: Martin Reddy <lynx@lindenlab.com>
Date: Fri, 4 Sep 2009 12:11:27 +0000
Subject: Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) into
 Viewer 2.0 (viewer-2.0.0-3). This provides support for clickable Urls in text
 editors and textboxes, with right-click context menus, tooltips, and
 alternate link labels. This includes alert boxes, the login progress window,
 local chat and IM interfaces, etc. As well as context menus for avatars and
 groups in list widgets. Includes fixes for the following individual JIRAs:

DEV-8763 VWR-10636: Hyperlinks in alert dialogs should be selectable (clickable)!
DEV-38829 EXT-742: Remove LLLink class
DEV-35459 VWR-14679: SLURLs and teleport Links not parsed properly
DEV-19842 VWR-8773: Closing parenthesis ")" breaks urls
DEV-21577 VWR-9405: In-world SLURLs containing "(" or ")" are not treated as a hyperlink in chat
DEV-37652 SEC-435: Object Chat/IMs are untraceable (VWR-2388) Fix has left flaw
DEV-10353: URLs in chat log terminated incorrectly when newline in chat
DEV-2925: In chat history, use a teleport hyperlink as source name for object IMs
DEV-36192: Need a way to copy Avatar names and Group names
DEV-2926: Allow viewer hyperlinks to have different text than the actual url
DEV-27253: Add easy way to copy URLs from viewer chat
DEV-38274: Make About Second Life window use new Url hyperlinking features
DEV-39076: No url support in Text Editors
DEV-7476 VWR-2172: Add hyperlinks to chat console for easier access
DEV-7475: Add hyperlinks to notecards!
DEV-35375 EXT-128: HTTPS urls aren't loaded in the internal browser by click

Master JIRA issues: DEV-32819, DEV-323820, DEV-7474

Testing performed against QAR-1789

svn merge -r 131623:131889 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
svn merge -r 131978:132515 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-slurl-3
---
 .../skins/default/xui/en/menu_url_agent.xml        | 28 ++++++++++++++++
 .../skins/default/xui/en/menu_url_group.xml        | 28 ++++++++++++++++
 .../newview/skins/default/xui/en/menu_url_http.xml | 37 ++++++++++++++++++++++
 .../skins/default/xui/en/menu_url_objectim.xml     | 37 ++++++++++++++++++++++
 .../skins/default/xui/en/menu_url_parcel.xml       | 21 ++++++++++++
 .../skins/default/xui/en/menu_url_slapp.xml        | 21 ++++++++++++
 .../skins/default/xui/en/menu_url_slurl.xml        | 30 ++++++++++++++++++
 .../skins/default/xui/en/menu_url_teleport.xml     | 21 ++++++++++++
 .../skins/default/xui/en/panel_edit_profile.xml    | 12 ++++---
 .../newview/skins/default/xui/en/panel_profile.xml | 13 +++-----
 .../skins/default/xui/en/panel_progress.xml        |  4 +--
 indra/newview/skins/default/xui/en/strings.xml     | 13 ++++++++
 12 files changed, 250 insertions(+), 15 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_agent.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_group.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_http.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_objectim.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_parcel.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_slapp.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_slurl.xml
 create mode 100644 indra/newview/skins/default/xui/en/menu_url_teleport.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_url_agent.xml b/indra/newview/skins/default/xui/en/menu_url_agent.xml
new file mode 100644
index 0000000000..463a9fccb6
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_agent.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Show Resident Profile"
+     layout="topleft"
+     name="show_agent">
+        <menu_item_call.on_click
+         function="Url.Execute" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy Name To Clipboard"
+     layout="topleft"
+     name="url_copy_label">
+        <menu_item_call.on_click
+         function="Url.CopyLabel" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy SLURL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_group.xml b/indra/newview/skins/default/xui/en/menu_url_group.xml
new file mode 100644
index 0000000000..cec0aa421e
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_group.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Show Group Information"
+     layout="topleft"
+     name="show_group">
+        <menu_item_call.on_click
+         function="Url.Execute" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy Group To Clipboard"
+     layout="topleft"
+     name="url_copy_label">
+        <menu_item_call.on_click
+         function="Url.CopyLabel" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy SLURL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_http.xml b/indra/newview/skins/default/xui/en/menu_url_http.xml
new file mode 100644
index 0000000000..2503b4a2a3
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_http.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Open Web Page"
+     layout="topleft"
+     name="url_open">
+        <menu_item_call.on_click
+         function="Url.Open" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Open in Internal Browser"
+     layout="topleft"
+     name="url_open_internal">
+        <menu_item_call.on_click
+         function="Url.OpenInternal" />
+    </menu_item_call>
+    <menu_item_call
+     label="Open in External Browser"
+     layout="topleft"
+     name="url_open_external">
+        <menu_item_call.on_click
+         function="Url.OpenExternal" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy URL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
new file mode 100644
index 0000000000..7d09403b15
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Show Object Information"
+     layout="topleft"
+     name="show_object">
+        <menu_item_call.on_click
+         function="Url.Execute" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Teleport to Object Location"
+     layout="topleft"
+     name="teleport_to_object">
+        <menu_item_call.on_click
+         function="Url.Teleport" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy Object Name To Clipboard"
+     layout="topleft"
+     name="url_copy_label">
+        <menu_item_call.on_click
+         function="Url.CopyLabel" />
+    </menu_item_call>
+    <menu_item_call
+     label="Copy SLURL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_parcel.xml b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
new file mode 100644
index 0000000000..bbd63c6d8c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_parcel.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Show Parcel Information"
+     layout="topleft"
+     name="show_parcel">
+        <menu_item_call.on_click
+         function="Url.Execute" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy SLURL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_slapp.xml b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
new file mode 100644
index 0000000000..19df721b2b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_slapp.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Run This Command"
+     layout="topleft"
+     name="run_slapp">
+        <menu_item_call.on_click
+         function="Url.Execute" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy SLURL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_slurl.xml b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
new file mode 100644
index 0000000000..0e9525fa4b
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_slurl.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Show Place Information"
+     layout="topleft"
+     name="show_place">
+        <menu_item_call.on_click
+         function="Url.Execute" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Teleport to Location"
+     layout="topleft"
+     name="teleport_to_location">
+        <menu_item_call.on_click
+         function="Url.Teleport" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy SLURL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_url_teleport.xml b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
new file mode 100644
index 0000000000..22cc035e49
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_url_teleport.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<context_menu
+ layout="topleft"
+ name="Url Popup">
+    <menu_item_call
+     label="Teleport To This Location"
+     layout="topleft"
+     name="teleport">
+        <menu_item_call.on_click
+         function="Url.Execute" />
+    </menu_item_call>
+    <menu_item_separator
+     layout="topleft" />
+    <menu_item_call
+     label="Copy SLURL To Clipboard"
+     layout="topleft"
+     name="url_copy">
+        <menu_item_call.on_click
+         function="Url.CopyUrl" />
+    </menu_item_call>
+</context_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index c0366437db..fa02cdb4b2 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -12,6 +12,10 @@
  name="edit_profile_panel"
  top="10"
  width="255">
+   <string
+    name="partner_edit_link_url">
+       http://www.secondlife.com/account/partners.php?lang=en
+   </string>
    <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
@@ -243,11 +247,10 @@
          top_pad="15"
          value="Account Status:"
          width="100" />
-        <link
+        <text
          type="string"
          follows="left|top"
          font="SansSerifSmall"
-	 font.style="UNDERLINE"
          height="15"
          layout="topleft"
          left_pad="10"
@@ -277,15 +280,14 @@
          top_pad="15"
          value="Partner:"
          width="100" />
-	<link
+        <text
          follows="left|top"
          height="15"
-	 font.style="UNDERLINE"
          layout="topleft"
          left_pad="10"
          name="partner_edit_link"
          top_delta="0"
-         value="Edit"
+         value="[[URL] Edit]"
          width="100" />
         <panel
          follows="left|top|right"
diff --git a/indra/newview/skins/default/xui/en/panel_profile.xml b/indra/newview/skins/default/xui/en/panel_profile.xml
index d90be9ea25..135dcb167b 100644
--- a/indra/newview/skins/default/xui/en/panel_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_profile.xml
@@ -167,11 +167,10 @@
          width="255">
              Homepage:
         </text>
-        <link
+        <text
          follows="left|top|right"
          height="15"
          layout="topleft"
-	 font.style="UNDERLINE"
          left="10"
          name="homepage_edit"
          top_pad="5"
@@ -212,11 +211,10 @@
          top_pad="15"
          value="Account Status:"
          width="100" />
-       <!-- <link
+       <!-- <text
          type="string"
          follows="left|top"
          font="SansSerifSmall"
-	 font.style="UNDERLINE"
          height="15"
          layout="topleft"
          left_pad="10"
@@ -246,16 +244,15 @@
          top_pad="15"
          value="Partner:"
          width="100" />
-	<!--<link
+        <text
          follows="left|top"
          height="15"
-	 font.style="UNDERLINE"
          layout="topleft"
          left_pad="10"
          name="partner_edit_link"
          top_delta="0"
-         value="Edit"
-         width="100" />  -->
+         value="[[URL] Edit]"
+         width="100" />
         <panel
          follows="left|top|right"
          height="15"
diff --git a/indra/newview/skins/default/xui/en/panel_progress.xml b/indra/newview/skins/default/xui/en/panel_progress.xml
index 4f23c4d26d..9b2461db7c 100644
--- a/indra/newview/skins/default/xui/en/panel_progress.xml
+++ b/indra/newview/skins/default/xui/en/panel_progress.xml
@@ -99,12 +99,12 @@
                      halign="left"
                      height="100"
                      layout="topleft"
-                     left="30"
+                     left="45"
                      line_spacing="2"
                      name="message_text"
                      text_color="LoginProgressBoxTextColor"
                      top="145"
-                     width="610" />
+                     width="550" />
                 </layout_panel>
                 <layout_panel
                  height="200"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 323c08ec4c..b8152a4956 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -74,6 +74,18 @@
 	<string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>	
 	<string name="TooltipAltLeft">Alt-Left arrow for previous tab</string>	
 	<string name="TooltipAltRight">Alt-Right arrow for next tab</string>	
+
+	<!-- tooltips for Urls -->
+	<string name="TooltipHttpUrl">Click to view this web page</string>
+	<string name="TooltipSLURL">Click to view this location's information</string>
+	<string name="TooltipAgentUrl">Click to view this resident's profile</string>
+	<string name="TooltipGroupUrl">Click to view this group's description</string>
+	<string name="TooltipEventUrl">Click to view this event's description</string>
+	<string name="TooltipClassifiedUrl">Click to view this classified</string>
+	<string name="TooltipParcelUrl">Click to view this parcel's description</string>
+	<string name="TooltipTeleportUrl">Click to teleport to this location</string>
+	<string name="TooltipObjectIMUrl">Click to view this object's description</string>
+	<string name="TooltipSLAPP">Click to run the secondlife:// command</string>
 	
 	<!-- ButtonToolTips, llfloater.cpp -->
 	<string name="BUTTON_CLOSE_DARWIN">Close (&#8984;-W)</string>
@@ -259,6 +271,7 @@
 
 	<!-- IM -->
 	<string name="IM_logging_string">-- Instant message logging enabled --</string>
+	<string name="Unnamed">(Unnamed)</string>
 	
 	<!-- Sim Access labels -->
 	<string name="SIM_ACCESS_PG">PG</string>
-- 
cgit v1.2.3


From ad169d3f540c475cdabf34e5cd8219ba6caa8eb6 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Fri, 4 Sep 2009 23:55:15 +0000
Subject: DEV-39508 = Show Tools ("Build") menu by default * Also eliminated
 some unused settings

---
 indra/newview/skins/default/xui/en/menu_viewer.xml | 581 +++++++++++----------
 1 file changed, 317 insertions(+), 264 deletions(-)

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 3570ef147c..6bc12368b7 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -229,7 +229,7 @@
              function="Floater.Toggle"
              parameter="communicate" />
         </menu_item_check>
-		<menu_item_call
+        <menu_item_call
          label="(Temp) Media Remote Ctrl"
          layout="topleft"
          name="Preferences"
@@ -284,6 +284,44 @@
              function="Floater.Show"
              parameter="region_info" />
         </menu_item_call>
+        <menu
+           create_jump_keys="true"
+           label="Land Options"
+           layout="topleft"
+           name="Land"
+           tear_off="true">
+          <menu_item_check
+             label="Show Property Lines"
+             layout="topleft"
+             name="Property Lines"
+             shortcut="control|alt|shift|P">
+            <menu_item_check.on_check
+               control="ShowPropertyLines" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="ShowPropertyLines" />
+          </menu_item_check>
+          <menu_item_check
+             label="Show Land Owners"
+             layout="topleft"
+             name="Land Owners">
+            <menu_item_check.on_check
+               control="ShowParcelOwners" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="ShowParcelOwners" />
+          </menu_item_check>
+          <menu_item_check
+             label="Show Ban Lines"
+             layout="topleft"
+             name="Ban Lines">
+            <menu_item_check.on_check
+               control="ShowBanLines" />
+            <menu_item_check.on_click
+               function="ToggleControl"
+               parameter="ShowBanLines" />
+          </menu_item_check>
+        </menu>
         <menu_item_separator
          layout="topleft" />
         <menu
@@ -351,7 +389,7 @@
          shortcut="control|shift|M">
             <menu_item_check.on_check
              function="Floater.Visible"
-			 parameter="mini_map" />
+             parameter="mini_map" />
             <menu_item_check.on_click
              function="Floater.Toggle"
              parameter="mini_map" />
@@ -369,7 +407,7 @@
         </menu_item_call>
         <menu_item_separator
          layout="topleft" />
-	<menu
+    <menu
          create_jump_keys="true"
          label="Sun Settings"
          layout="topleft"
@@ -430,87 +468,78 @@
         </menu>
        <menu_item_separator
          layout="topleft" />
-	<menu_item_check
-         label="Build"
+    </menu>
+    <menu
+     create_jump_keys="true"
+     label="Build"
+     layout="topleft"
+     name="BuildTools"
+     tear_off="true"
+     visible="true">
+       <menu_item_check
+         label="Show Build Tools"
          layout="topleft"
-         name="Build"
-         shortcut="B">
+         name="Show Build Tools"
+         shortcut="control|B">
             <menu_item_check.on_check
              function="Build.Active" />
             <menu_item_check.on_click
              function="Build.Toggle" />
             <menu_item_check.on_enable
              function="Build.Enabled" />
-        </menu_item_check>
-    </menu>
-    <menu
-     label="Help"
-     layout="topleft"
-     name="Help"
-     tear_off="true">
-        <menu_item_call
-         label="[SECOND_LIFE] Help"
-         layout="topleft"
-         name="Second Life Help"
-         shortcut="F1">
-            <menu_item_call.on_click
-             function="ShowFloater"
-             parameter="help f1" />
-        </menu_item_call>
-        <menu_item_call
-         label="Tutorial"
-         layout="topleft"
-         name="Tutorial">
-            <menu_item_call.on_click
-             function="Floater.Show"
-             parameter="hud" />
-        </menu_item_call>
-        <menu_item_check
-         label="Show Quick Tips"
-         layout="topleft"
-         name="Show Quick Tips">
-            <menu_item_check.on_check
-             function="Help.CheckShowFirstTimeTip" />
-            <menu_item_check.on_click
-             function="Help.ShowQuickTips" />
-        </menu_item_check>
-        <menu_item_separator
-             layout="topleft" />
-        <menu_item_call
-             label="Report Bug..."
-             layout="topleft"
-             name="ReportBug">
-            <menu_item_call.on_click
-                 function="PromptShowURL"
-                 name="ReportBug_url"
-                 parameter="hud,http://help.secondlife.com/en/bugreport/" />
-        </menu_item_call>
-        <menu_item_call
-             label="Report Abuse..."
-             layout="topleft"
-             name="Report Abuse">
-                <menu_item_call.on_click
-                 function="ShowFloater"
-                 parameter="complaint reporter" />
-            </menu_item_call>
-        <menu_item_separator
-             layout="topleft" />
-        <menu_item_call
-         label="About [APP_NAME]"
-         layout="topleft"
-         name="About Second Life">
-            <menu_item_call.on_click
-             function="Floater.Show"
-             parameter="sl_about" />
-        </menu_item_call>
-    </menu>
-    <menu
-     create_jump_keys="true"
-     label="Tools"
-     layout="topleft"
-     name="BuildTools"
-     tear_off="true"
-     visible="false">
+       </menu_item_check>
+       <menu
+          create_jump_keys="true"
+          label="Select Build Tool"
+          layout="topleft"
+          name="Select Tool"
+          tear_off="true">
+         <menu_item_call
+			label="Focus Tool"
+			layout="topleft"
+			name="Focus"
+			shortcut="control|1">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="focus" />
+         </menu_item_call>
+         <menu_item_call
+			label="Move Tool"
+			layout="topleft"
+			name="Move"
+			shortcut="control|2">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="move" />
+         </menu_item_call>
+         <menu_item_call
+			label="Edit Tool"
+			layout="topleft"
+			name="Edit"
+			shortcut="control|3">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="edit" />
+         </menu_item_call>
+         <menu_item_call
+			label="Create Tool"
+			layout="topleft"
+			name="Create"
+			shortcut="control|4">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="create" />
+         </menu_item_call>
+         <menu_item_call
+			label="Land Tool"
+			layout="topleft"
+			name="Land"
+			shortcut="control|5">
+           <menu_item_call.on_click
+              function="Tools.SelectTool"
+              parameter="land" />
+         </menu_item_call>
+	   </menu>
         <menu
          create_jump_keys="true"
          label="Edit"
@@ -612,6 +641,159 @@
                  function="Edit.EnableDeselect" />
             </menu_item_call>
         </menu>
+        <menu_item_separator
+           layout="topleft" />
+        <menu_item_call
+           label="Link"
+           layout="topleft"
+           name="Link"
+           shortcut="control|L">
+          <menu_item_call.on_click
+             function="Tools.Link" />
+          <menu_item_call.on_enable
+             function="Tools.EnableLink" />
+        </menu_item_call>
+        <menu_item_call
+           label="Unlink"
+           layout="topleft"
+           name="Unlink"
+           shortcut="control|shift|L">
+          <menu_item_call.on_click
+             function="Tools.Unlink" />
+          <menu_item_call.on_enable
+             function="Tools.EnableUnlink" />
+        </menu_item_call>
+        <menu_item_separator
+           layout="topleft" />
+        <menu_item_call
+           label="Focus on Selection"
+           layout="topleft"
+           name="Focus on Selection"
+           shortcut="H">
+          <menu_item_call.on_click
+             function="Tools.LookAtSelection"
+             parameter="focus" />
+          <menu_item_call.on_enable
+             function="Tools.SomethingSelectedNoHUD" />
+        </menu_item_call>
+        <menu_item_call
+           label="Zoom to Selection"
+           layout="topleft"
+           name="Zoom to Selection"
+           shortcut="shift|H">
+          <menu_item_call.on_click
+             function="Tools.LookAtSelection"
+             parameter="zoom" />
+          <menu_item_call.on_enable
+             function="Tools.SomethingSelectedNoHUD" />
+        </menu_item_call>
+        <menu_item_separator
+           layout="topleft" />
+        <menu
+         create_jump_keys="true"
+         label="Object"
+         layout="topleft"
+         name="Object"
+         tear_off="true">
+          <menu_item_call
+			 label="Buy"
+			 layout="topleft"
+			 name="Menu Object Take"
+			 visible="true">
+			<menu_item_call.on_click
+               function="Tools.BuyOrTake" />
+			<menu_item_call.on_enable
+               function="Tools.EnableBuyOrTake"
+               name="EnableBuyOrTake"
+               parameter="Buy,Take" />
+          </menu_item_call>
+          <menu_item_call
+			 label="Take Copy"
+			 layout="topleft"
+			 name="Take Copy">
+			<menu_item_call.on_click
+               function="Tools.TakeCopy" />
+			<menu_item_call.on_enable
+               function="Tools.EnableTakeCopy" />
+          </menu_item_call>
+          <menu_item_call
+			 label="Save Back to My Inventory"
+			 layout="topleft"
+			 name="Save Object Back to My Inventory">
+			<menu_item_call.on_click
+               function="Tools.SaveToInventory" />
+			<menu_item_call.on_enable
+               function="Tools.EnableSaveToInventory" />
+          </menu_item_call>
+          <menu_item_call
+			 label="Save Back to Object Contents"
+			 layout="topleft"
+			 name="Save Object Back to Object Contents">
+			<menu_item_call.on_click
+               function="Tools.SaveToObjectInventory" />
+			<menu_item_call.on_enable
+               function="Tools.EnableSaveToObjectInventory" />
+          </menu_item_call>
+		</menu>
+        <menu
+           create_jump_keys="true"
+           label="Scripts"
+           layout="topleft"
+           name="Scripts"
+           tear_off="true">
+          <menu_item_call
+             label="Recompile Scripts (Mono)"
+             layout="topleft"
+             name="Mono">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="compile mono" />
+            <menu_item_call.on_enable
+               function="EditableSelectedMono" />
+          </menu_item_call>
+          <menu_item_call
+             label="Recompile Scripts (LSL)"
+             layout="topleft"
+             name="LSL">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="compile lsl" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call
+             label="Reset Scripts"
+             layout="topleft"
+             name="Reset Scripts">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="reset" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call
+             label="Set Scripts to Running"
+             layout="topleft"
+             name="Set Scripts to Running">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="start" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+          <menu_item_call
+             label="Set Scripts to Not Running"
+             layout="topleft"
+             name="Set Scripts to Not Running">
+            <menu_item_call.on_click
+               function="Tools.SelectedScriptAction"
+               parameter="stop" />
+            <menu_item_call.on_enable
+               function="EditableSelected" />
+          </menu_item_call>
+        </menu>
+        <menu_item_separator
+           layout="topleft" />
         <menu
          create_jump_keys="true"
          label="Options"
@@ -800,196 +982,68 @@
                      parameter="CheesyBeacon" />
                 </menu_item_check>
             </menu>
-            <menu
-             create_jump_keys="true"
-             label="Land"
-             layout="topleft"
-             name="Land"
-             tear_off="true">
-                <menu_item_check
-                 label="Property Lines"
-                 layout="topleft"
-                 name="Property Lines"
-                 shortcut="control|alt|shift|P">
-                    <menu_item_check.on_check
-                     control="ShowPropertyLines" />
-                    <menu_item_check.on_click
-                     function="ToggleControl"
-                     parameter="ShowPropertyLines" />
-                </menu_item_check>
-                <menu_item_check
-                 label="Land Owners"
-                 layout="topleft"
-                 name="Land Owners">
-                    <menu_item_check.on_check
-                     control="ShowParcelOwners" />
-                    <menu_item_check.on_click
-                     function="ToggleControl"
-                     parameter="ShowParcelOwners" />
-                </menu_item_check>
-                <menu_item_check
-                 label="Ban Lines"
-                 layout="topleft"
-                 name="Ban Lines">
-                    <menu_item_check.on_check
-                     control="ShowBanLines" />
-                    <menu_item_check.on_click
-                     function="ToggleControl"
-                     parameter="ShowBanLines" />
-                </menu_item_check>
-            </menu>
         </menu>
-        <menu
-         create_jump_keys="true"
-         label="Actions"
+    </menu>
+    <menu
+     label="Help"
+     layout="topleft"
+     name="Help"
+     tear_off="true">
+        <menu_item_call
+         label="[SECOND_LIFE] Help"
          layout="topleft"
-         name="Actions"
-         tear_off="true">
-            <menu_item_call
-             label="Link"
-             layout="topleft"
-             name="Link"
-             shortcut="control|L">
-                <menu_item_call.on_click
-                 function="Tools.Link" />
-                <menu_item_call.on_enable
-                 function="Tools.EnableLink" />
-            </menu_item_call>
-            <menu_item_call
-             label="Unlink"
-             layout="topleft"
-             name="Unlink"
-             shortcut="control|shift|L">
-                <menu_item_call.on_click
-                 function="Tools.Unlink" />
-                <menu_item_call.on_enable
-                 function="Tools.EnableUnlink" />
-            </menu_item_call>
-            <menu_item_separator
-             layout="topleft" />
-            <menu_item_call
-             label="Focus on Selection"
-             layout="topleft"
-             name="Focus on Selection"
-             shortcut="H">
-                <menu_item_call.on_click
-                 function="Tools.LookAtSelection"
-                 parameter="focus" />
-                <menu_item_call.on_enable
-                 function="Tools.SomethingSelectedNoHUD" />
-            </menu_item_call>
-            <menu_item_call
-             label="Zoom to Selection"
-             layout="topleft"
-             name="Zoom to Selection"
-             shortcut="shift|H">
-                <menu_item_call.on_click
-                 function="Tools.LookAtSelection"
-                 parameter="zoom" />
-                <menu_item_call.on_enable
-                 function="Tools.SomethingSelectedNoHUD" />
-            </menu_item_call>
-            <menu_item_separator
+         name="Second Life Help"
+         shortcut="F1">
+            <menu_item_call.on_click
+             function="ShowFloater"
+             parameter="help f1" />
+        </menu_item_call>
+        <menu_item_call
+         label="Tutorial"
+         layout="topleft"
+         name="Tutorial">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="hud" />
+        </menu_item_call>
+        <menu_item_check
+         label="Show Quick Tips"
+         layout="topleft"
+         name="Show Quick Tips">
+            <menu_item_check.on_check
+             function="Help.CheckShowFirstTimeTip" />
+            <menu_item_check.on_click
+             function="Help.ShowQuickTips" />
+        </menu_item_check>
+        <menu_item_separator
              layout="topleft" />
-            <menu_item_call
-             label="Buy Object"
-             layout="topleft"
-             name="Menu Object Take"
-             visible="false">
-                <menu_item_call.on_click
-                 function="Tools.BuyOrTake" />
-                <menu_item_call.on_enable
-                 function="Tools.EnableBuyOrTake"
-                 name="EnableBuyOrTake"
-                 parameter="Buy,Take" />
-            </menu_item_call>
-            <menu_item_call
-             label="Take Copy"
-             layout="topleft"
-             name="Take Copy">
-                <menu_item_call.on_click
-                 function="Tools.TakeCopy" />
-                <menu_item_call.on_enable
-                 function="Tools.EnableTakeCopy" />
-            </menu_item_call>
-            <menu_item_call
-             label="Save Object Back to My Inventory"
+        <menu_item_call
+             label="Report Bug..."
              layout="topleft"
-             name="Save Object Back to My Inventory">
-                <menu_item_call.on_click
-                 function="Tools.SaveToInventory" />
-                <menu_item_call.on_enable
-                 function="Tools.EnableSaveToInventory" />
-            </menu_item_call>
-            <menu_item_call
-             label="Save Object Back to Object Contents"
+             name="ReportBug">
+            <menu_item_call.on_click
+                 function="PromptShowURL"
+                 name="ReportBug_url"
+                 parameter="hud,http://help.secondlife.com/en/bugreport/" />
+        </menu_item_call>
+        <menu_item_call
+             label="Report Abuse..."
              layout="topleft"
-             name="Save Object Back to Object Contents">
+             name="Report Abuse">
                 <menu_item_call.on_click
-                 function="Tools.SaveToObjectInventory" />
-                <menu_item_call.on_enable
-                 function="Tools.EnableSaveToObjectInventory" />
+                 function="ShowFloater"
+                 parameter="complaint reporter" />
             </menu_item_call>
-            <menu_item_separator
+        <menu_item_separator
              layout="topleft" />
-            <menu
-             create_jump_keys="true"
-             label="Recompile Scripts in Selection"
-             layout="topleft"
-             name="Recompile Scripts in Selection"
-             tear_off="true">
-                <menu_item_call
-                 label="Mono"
-                 layout="topleft"
-                 name="Mono">
-                    <menu_item_call.on_click
-                     function="Tools.SelectedScriptAction"
-                     parameter="compile mono" />
-                    <menu_item_call.on_enable
-                     function="EditableSelectedMono" />
-                </menu_item_call>
-                <menu_item_call
-                 label="LSL"
-                 layout="topleft"
-                 name="LSL">
-                    <menu_item_call.on_click
-                     function="Tools.SelectedScriptAction"
-                     parameter="compile lsl" />
-                    <menu_item_call.on_enable
-                     function="EditableSelected" />
-                </menu_item_call>
-            </menu>
-            <menu_item_call
-             label="Reset Scripts in Selection"
-             layout="topleft"
-             name="Reset Scripts in Selection">
-                <menu_item_call.on_click
-                 function="Tools.SelectedScriptAction"
-                 parameter="reset" />
-                <menu_item_call.on_enable
-                 function="EditableSelected" />
-            </menu_item_call>
-            <menu_item_call
-             label="Set Scripts to Running in Selection"
-             layout="topleft"
-             name="Set Scripts to Running in Selection">
-                <menu_item_call.on_click
-                 function="Tools.SelectedScriptAction"
-                 parameter="start" />
-                <menu_item_call.on_enable
-                 function="EditableSelected" />
-            </menu_item_call>
-            <menu_item_call
-             label="Set Scripts to Not Running in Selection"
-             layout="topleft"
-             name="Set Scripts to Not Running in Selection">
-                <menu_item_call.on_click
-                 function="Tools.SelectedScriptAction"
-                 parameter="stop" />
-                <menu_item_call.on_enable
-                 function="EditableSelected" />
-            </menu_item_call>
-        </menu>
+        <menu_item_call
+         label="About [APP_NAME]"
+         layout="topleft"
+         name="About Second Life">
+            <menu_item_call.on_click
+             function="Floater.Show"
+             parameter="sl_about" />
+        </menu_item_call>
     </menu>
     <menu
      label="Advanced"
@@ -1035,7 +1089,6 @@
                  function="World.AlwaysRun" />
             </menu_item_check>
             <menu_item_check
-             control_name="FlyBtnState"
              label="Fly"
              layout="topleft"
              name="Fly"
@@ -1827,7 +1880,7 @@
              function="Advanced.ShowDebugSettings"
              parameter="all" />
         </menu_item_call>
-	 <menu_item_check
+     <menu_item_check
          label="Debug (QA) Mode"
          layout="topleft"
          name="Debug Mode"
@@ -2496,7 +2549,7 @@
              name="Simple Web Browser Test">
                 <menu_item_call.on_click
                  function="Floater.Show"
-				 parameter="html_simple.http://www.secondlife.com" />
+                 parameter="html_simple.http://www.secondlife.com" />
             </menu_item_call>
             <menu_item_call
              label="UI/Color Settings"
@@ -2665,7 +2718,7 @@
              name="Show Font Test">
                 <menu_item_call.on_click
                  function="Floater.Show"
-				 parameter="font_test" />
+                 parameter="font_test" />
             </menu_item_call>
             <menu_item_call
              label="Load from XML..."
@@ -3143,7 +3196,7 @@
          name="God Tools">
             <menu_item_call.on_click
              function="Floater.Show"
-			 parameter="god_tools" />
+             parameter="god_tools" />
             <menu_item_call.on_enable
              function="EnableGodCustomerService" />
         </menu_item_call>
-- 
cgit v1.2.3


From 79653dfed48105019b8ecca9cf4bfaa2a390e100 Mon Sep 17 00:00:00 2001
From: Steven Bennetts <steve@lindenlab.com>
Date: Mon, 7 Sep 2009 22:55:07 +0000
Subject: merge
 https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1566
 https://svn.aws.productengine.com/secondlife/pe/stable-2@1580 ->
 viewer-2.0.0-3 * Bugs: EXT-807 EXT-810 EXT-811 EXT-784 EXT-820 EXT-393
 EXT-826 EXT-811 EXT-801 EXT-808 EXT-393 EXT-743 EXT-699 EXT-397 EXT-812
 EXT-736 EXT-744 EXT-809 EXT-306 EXT-854 EXT-857 EXT-790 * New Dev: EXT-694
 EXT-393 EXT-367 EXT-819 EXT-795 EXT-827 EXT-788 * EXT-272 - Draggable
 Landmarks * EXT-715 - Block List Panel * EXT-782 - Implement advanced place
 information accordions

---
 indra/newview/skins/default/textures/textures.xml  |  1 +
 .../xui/en/menu_people_friends_view_sort.xml       |  4 ++
 .../xui/en/menu_people_nearby_view_sort.xml        |  4 ++
 .../xui/en/menu_people_recent_view_sort.xml        |  4 ++
 .../default/xui/en/panel_block_list_sidetray.xml   | 84 ++++++++++++++++++++++
 .../skins/default/xui/en/panel_bottomtray.xml      |  2 +-
 .../skins/default/xui/en/panel_edit_profile.xml    | 38 +++++++++-
 .../skins/default/xui/en/panel_group_notify.xml    | 80 ++++++++++++++++-----
 .../skins/default/xui/en/panel_instant_message.xml |  6 +-
 .../skins/default/xui/en/panel_navigation_bar.xml  | 13 ++--
 .../skins/default/xui/en/panel_pick_list_item.xml  | 20 ++++++
 .../skins/default/xui/en/panel_side_tray.xml       |  7 ++
 .../skins/default/xui/en/widgets/accordion_tab.xml |  6 ++
 .../newview/skins/default/xui/en/widgets/list.xml  |  1 +
 .../default/xui/en/widgets/location_input.xml      |  2 +-
 .../default/xui/en/widgets/search_combo_box.xml    | 26 +++++++
 16 files changed, 270 insertions(+), 28 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
 create mode 100644 indra/newview/skins/default/xui/en/widgets/search_combo_box.xml

(limited to 'indra/newview/skins')

diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 0bd5f114ed..e32ea0944e 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -93,6 +93,7 @@
   <texture name="Info_Press" file_name="navbar/Info_Press.png" preload="false"/>
 
   <texture name="ListItem_Select" file_name="widgets/ListItem_Select.png" preload="true" />
+  <texture name="ListItem_Over" file_name="widgets/ListItem_Over.png" preload="true" />
 
   <texture name="menu_separator" file_name="navbar/FileMenu_Divider.png" scale.left="4" scale.top="166" scale.right="0" scale.bottom="0" />
 
diff --git a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
index bb5a4e51f7..6ef1eb9513 100644
--- a/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml
@@ -15,4 +15,8 @@
   <menu_item_call name="organize_offline" label="Organize Offline Friends">
     <menu_item_call.on_click function="People.Friends.ViewSort.Action" userdata="organize_offline" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="SideTray.ShowPanel" parameter="panel_block_list_sidetray" />
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
index 8c2c5e8c9e..2b0f029016 100644
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
@@ -15,4 +15,8 @@
   <menu_item_call name="view_icons" label="View People Icons">
     <menu_item_call.on_click function="People.Nearby.ViewSort.Action" userdata="view_icons" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
index 00cf443cc6..88b0528e53 100644
--- a/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
+++ b/indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml
@@ -12,4 +12,8 @@
   <menu_item_call name="view_icons" label="View People Icons">
     <menu_item_call.on_click function="People.Recent.ViewSort.Action" userdata="view_icons" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
+  <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
+    <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
+  </menu_item_call>
 </menu>
diff --git a/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
new file mode 100644
index 0000000000..5c8a8ee208
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="305"
+ layout="topleft"
+ name="block_list_panel"
+ min_height="350"
+ min_width="240"
+ width="280">
+    <text 
+     follows="top|left|right"
+     font="SansSerifHugeBold"
+     height="20"
+     layout="topleft"
+     left="10" 
+     name="title_text"
+     text_color="white"
+     top="0" 
+     width="250">
+        Blocked List
+     </text>
+     <button 
+     follows="top|right"
+     height="25"
+     image_overlay="BackArrow_Off"
+     layout="topleft"
+     name="back"
+     right="-9"
+     tab_stop="false" 
+     top="0"
+     width="25"/>
+    <scroll_list
+     follows="left|top|right|bottom"
+     height="200"
+     layout="topleft"
+     left="5"
+     name="blocked"
+     tool_tip="List of currently blocked residents"
+     top="30"
+     width="270" />
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Block Resident..."
+     label_selected="Block Resident..."
+     layout="topleft"
+     left_delta="0"
+     name="Block resident..."
+     tool_tip="Pick a resident to block"
+     top_pad="4"
+     width="210">
+        <button.commit_callback
+         function="Block.ClickPick" />
+    </button>
+    <button
+     follows="left|bottom"
+     height="20"
+     label="Block object by name..."
+     label_selected="Block object by name..."
+     layout="topleft"
+     left_delta="0"
+     name="Block object by name..."
+     top_pad="4"
+     width="210" >
+        <button.commit_callback
+         function="Block.ClickBlockByName" />
+    </button>
+    <button
+     enabled="false"
+     follows="left|bottom"
+     height="20"
+     label="Unblock"
+     label_selected="Unblock"
+     layout="topleft"
+     left_delta="0"
+     name="Unblock"
+     tool_tip="Remove resident or object from blocked list"
+     top_pad="4"
+     width="210" >
+        <button.commit_callback
+         function="Block.ClickRemove" />
+    </button>
+</panel>
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
index 8fc029bea6..79ca839f28 100644
--- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml
+++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml
@@ -266,7 +266,7 @@
              top="2"
              width="48">
               <button
-               image_selected="bottom_tray_sys_notifications.tga"
+               image_selected="bottom_tray_sys_notifications_selected.tga"
                image_unselected="bottom_tray_sys_notifications.tga"/>
               <unread_notifications
                width="20"
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
index fa02cdb4b2..0d6d8ba97d 100644
--- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml
+++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml
@@ -12,11 +12,45 @@
  name="edit_profile_panel"
  top="10"
  width="255">
+   <string
+    name="CaptionTextAcctInfo">
+       [ACCTTYPE] [PAYMENTINFO] [AGEVERIFICATION]
+   </string>
+   <string
+    name="AcctTypeResident"
+    value="Resident" />
+   <string
+    name="AcctTypeTrial"
+    value="Trial" />
+   <string
+    name="AcctTypeCharterMember"
+    value="Charter Member" />
+   <string
+    name="AcctTypeEmployee"
+    value="Linden Lab Employee" />
+   <string
+    name="PaymentInfoUsed"
+    value="Payment Info Used" />
+   <string
+    name="PaymentInfoOnFile"
+    value="Payment Info On File" />
+   <string
+    name="NoPaymentInfoOnFile"
+    value="No Payment Info On File" />
+   <string
+    name="AgeVerified"
+    value="Age-verified" />
+   <string
+    name="NotAgeVerified"
+    value="Not Age-verified" />
    <string
     name="partner_edit_link_url">
        http://www.secondlife.com/account/partners.php?lang=en
    </string>
-   <scroll_container
+   <string
+    name="no_partner_text"
+    value="None" />
+  <scroll_container
      color="DkGray2"
      follows="left|top|right|bottom"
      height="300"
@@ -38,7 +72,7 @@
      background_visible="true"
      bg_alpha_color="DkGray2"
      follows="left|top|right|bottom"  
-     height="620"
+     height="750"
      layout="topleft"
      left="0"
      name="data_panel" 
diff --git a/indra/newview/skins/default/xui/en/panel_group_notify.xml b/indra/newview/skins/default/xui/en/panel_group_notify.xml
index 8ebf1b69a7..f97daf922f 100644
--- a/indra/newview/skins/default/xui/en/panel_group_notify.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_notify.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <panel background_visible="true" bevel_style="in" bg_alpha_color="0 0 0 0"
-	height="200" label="instant_message" layout="topleft" left="0"
+	height="155" label="instant_message" layout="topleft" left="0"
 	name="panel_group_notify" top="0" width="350">
-	<panel background_visible="true" bevel_style="in" bg_alpha_color="black"
+    <string
+     name="message_max_lines_count">
+        4
+    </string>
+	<panel follows="top" background_visible="true" bevel_style="in" bg_alpha_color="black"
 		height="50" label="header" layout="topleft" left="0" name="header"
 		top="0" width="350">
 		<icon follows="left|top|right|bottom" height="40"  width="40" layout="topleft"
@@ -13,21 +17,61 @@
 			Sender Name / Group Name
         </text>
 	</panel>
-	<text_editor type="string" length="1" bg_readonly_color="0 0 0 0"
-		follows="left|top|right|bottom" height="70" hide_scrollbar="true"
-		hide_border="true" layout="topleft" top="55" left="25" name="message"
-		text_color="GroupNotifyTextColor" text_readonly_color="GroupNotifyTextColor" width="300" word_wrap="true">
-		Message
-		Body
-    </text_editor>
-	<icon follows="left|top|right|bottom" height="16" width="16"
-		layout="topleft" top="135" left="25" mouse_opaque="true" name="attachment_icon" />
+	<text
+     follows="top"
+     height="20"
+     layout="topleft"
+     left="25"
+     name="subject"
+     text_color="GroupNotifyTextColor"
+     font="SansSerifBig"
+     top="60"
+     use_ellipses="true"
+     value="subject"
+     width="300"
+     word_wrap="true">
+     subject 
+    </text>
+    <text
+     follows="top"
+     height="20"
+     layout="topleft"
+     left="25"
+     name="datetime"
+     text_color="GroupNotifyTextColor"
+     font="SansSerif"
+     top="80"
+     use_ellipses="true"
+     value="datetime"
+     width="300"
+     word_wrap="true">
+     datetime
+    </text>
+    <text
+     follows="left|top|bottom|right"
+     height="0"
+     layout="topleft"
+     left="25"
+     name="message"
+     text_color="GroupNotifyTextColor"
+     top="100"
+     use_ellipses="true"
+     value="message"
+     width="300"
+     word_wrap="true"
+     visible="true" >
+    </text>
+    <icon
+	  follows="left|bottom|right" height="15" width="15"
+		layout="topleft" bottom="122" left="25" mouse_opaque="true" name="attachment_icon" visible="true"
+	/>
 	<text font="SansSerif" font.style="UNDERLINE" font_shadow="hard"
-		type="string" length="1" follows="left|top|right|bottom" layout="topleft"
-		left="45" top="135" height="15" width="280" name="attachment"
-		text_color="GroupNotifyTextColor">
+		type="string" length="1" follows="left|bottom|right" layout="topleft"
+		left="45" bottom="122" height="15" width="280" name="attachment"
+		text_color="GroupNotifyTextColor" visible="true">
 		Attachment
-        </text>
-	<button label="OK" layout="topleft" top="170" left="140" height="20"
-		width="70" name="btn_ok" />
-</panel>
+     </text>
+
+	<button label="OK" layout="topleft" bottom="145" left="140" height="20"
+		width="70" name="btn_ok" follows="bottom" />
+</panel>
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
index 169fde7b47..ace456918c 100644
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ b/indra/newview/skins/default/xui/en/panel_instant_message.xml
@@ -10,6 +10,10 @@
  name="im_panel"
  top="0"
  width="350">
+    <string
+     name="message_max_lines_count">
+        6
+    </string>
     <panel
      background_visible="true"
      bevel_style="in"
@@ -56,7 +60,7 @@
          width="50" />
     </panel>
     <text
-     follows="left|bottom|right"
+     follows="left|top|bottom|right"
      height="60"
      layout="topleft"
      left="10"
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index dee911a45d..80dca8c0c1 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -107,8 +107,8 @@
 	<!--      picture_style="true" -->
 	<!--      top_delta="0" -->
 	<!--      width="168" /> -->
-	    
-	    <search_editor
+
+        <search_combo_box
 	     bevel_style="none"
 	     border_style="line"
 	     border.border_thickness="0"
@@ -118,12 +118,15 @@
 	     height="22"
 	     label="Search"
 	     layout="topleft"
-	     left_pad="7"
+	     right="-10"
 	     mouse_opaque="false"
-	     name="search_input"
+	     name="search_combo_box"
 	     tool_tip="Search"
 	     top_delta="0"
-	     width="200" />        
+	     width="200" >
+         <combo_editor
+          label="Search" />
+        </search_combo_box>
 	</panel>
 	
     <favorites_bar
diff --git a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
index 6f4110067b..4c8c4efbe7 100644
--- a/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_pick_list_item.xml
@@ -8,6 +8,26 @@
  name="picture_item"
  top="0"
  width="275">
+    <icon
+     height="120" 
+     image_name="ListItem_Over"
+     left="0" 
+     mouse_opaque="false"
+     name="hovered_icon" 
+     top="0"
+     scale_image="true" 
+     visible="false"
+     width="270"/>
+    <icon
+     height="120" 
+     image_name="ListItem_Select"
+     left="0" 
+     mouse_opaque="false"
+     name="selected_icon"
+     top="0"
+     scale_image="true"
+     visible="false"
+     width="270"/>
     <texture_picker
      allow_no_texture="true"
      default_image_name="None"
diff --git a/indra/newview/skins/default/xui/en/panel_side_tray.xml b/indra/newview/skins/default/xui/en/panel_side_tray.xml
index e9eac2c9dc..e166675364 100644
--- a/indra/newview/skins/default/xui/en/panel_side_tray.xml
+++ b/indra/newview/skins/default/xui/en/panel_side_tray.xml
@@ -57,6 +57,13 @@
         label="Group Info" 
         border="true"
       />
+      <panel 
+        class="panel_block_list_sidetray"
+        name="panel_block_list_sidetray" 
+        filename="panel_block_list_sidetray.xml" 
+        label="Blocked Residents &amp; Objects"
+        border="true"
+      />
 
     </panel_container>
   </sidetray_tab>
diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
new file mode 100644
index 0000000000..eabacbecb2
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<accordion_tab 
+    header_collapse_img="accordion_collapsed.tga" 
+    header_collapse_img_pressed="accordion_collapsed.tga" 
+    header_expand_img="accordion_expanded.tga"
+    header_expand_img_pressed="accordion_expanded.tga" />
diff --git a/indra/newview/skins/default/xui/en/widgets/list.xml b/indra/newview/skins/default/xui/en/widgets/list.xml
index 8c264205d5..4a59716464 100644
--- a/indra/newview/skins/default/xui/en/widgets/list.xml
+++ b/indra/newview/skins/default/xui/en/widgets/list.xml
@@ -6,4 +6,5 @@
  background_visible="false"
  background_opaque="false"
  item_pad="5"
+ keep_one_selected="true"
  multi_select="false" />
\ No newline at end of file
diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml
index 8f4d0edf95..297a3762f6 100644
--- a/indra/newview/skins/default/xui/en/widgets/location_input.xml
+++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml
@@ -43,7 +43,7 @@
                           label=""
                           pad_right="0"
                           tool_tip="My Location History"/>
-  <combo_list bg_writeable_color="MenuDefaultBgColor"/>
+  <combo_list bg_writeable_color="MenuDefaultBgColor" page_lines="10"/>
   <combo_editor name="Combo Text Entry"
                 text_pad_left="20"
                 select_on_focus="false"
diff --git a/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
new file mode 100644
index 0000000000..1d43b25f1d
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/widgets/search_combo_box.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<search_combo_box
+ allow_text_entry="true"
+ list_position="BELOW"
+ show_text_as_tentative="false"
+ dropdown_button_visible="false"
+ background_image="TextField_Search_Off"
+ background_image_disabled="TextField_Search_Disabled"
+ background_image_focused="TextField_Search_Active">
+ <combo_editor
+  select_on_focus="true"
+  text_pad_left="20" 
+  background_image="TextField_Search_Off"
+  background_image_disabled="TextField_Search_Disabled"
+  background_image_focused="TextField_Search_Active"/>
+ <combo_list
+  multi_select="false"
+  page_lines="10" />
+ <search_button label=""
+  top_pad="4"
+  left_pad="4" 
+  width="13"
+  height="13" 
+  image_unselected="Search"
+  image_selected="Search" />
+</search_combo_box>
\ No newline at end of file
-- 
cgit v1.2.3


From 2ed83382a1dd84575536c16e248a602ba96755cd Mon Sep 17 00:00:00 2001
From: Kurt Stauffacher <kurt@lindenlab.com>
Date: Tue, 8 Sep 2009 20:39:42 +0000
Subject: Floatercram the Report Abuse floater to fit in the side tray. 
 EXT-756

---
 .../skins/default/xui/en/floater_report_abuse.xml  | 148 +++++++++++----------
 1 file changed, 79 insertions(+), 69 deletions(-)

(limited to 'indra/newview/skins')

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 fcbc27a5f9..0da1e42986 100644
--- a/indra/newview/skins/default/xui/en/floater_report_abuse.xml
+++ b/indra/newview/skins/default/xui/en/floater_report_abuse.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
- height="590"
+ height="600"
  layout="topleft"
  name="floater_report_abuse"
  title="Report Abuse"
- width="390">
+ width="305">
     <floater.string
      name="Screenshot">
         Screenshot
@@ -15,27 +15,28 @@
      follows="left|top"
      height="114"
      layout="topleft"
-     left="238"
+     left="10"
      name="screenshot"
-     top="36"
+     top="25"
      width="134" />
     <check_box
      height="16"
      label="Include screenshot"
      layout="topleft"
-     left="13"
+     left_pad="10"
      name="screen_check"
-     top="134"
+     top="110"
      width="116" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
-     left_delta="3"
+     left="10"
      name="reporter_title"
-     top_delta="-102"
+     top_pad="12"
      width="50">
         Reporter:
     </text>
@@ -48,7 +49,7 @@
      left_pad="12"
      name="reporter_field"
      top_delta="0"
-     width="150">
+     width="193">
         Loremipsum Dolorsitamut
     </text>
     <text
@@ -56,10 +57,11 @@
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
-     left="16"
+     left="10"
      name="sim_title"
-     top="48"
+     top_pad="5"
      width="60">
         Region:
     </text>
@@ -72,7 +74,7 @@
      left_pad="2"
      name="sim_field"
      top_delta="0"
-     width="120">
+     width="193">
         Region Name
     </text>
     <text
@@ -80,10 +82,11 @@
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
-     left="16"
+     left="10"
      name="pos_title"
-     top="64"
+     top_pad="5"
      width="50">
         Position:
     </text>
@@ -96,18 +99,18 @@
      left_pad="12"
      name="pos_field"
      top_delta="0"
-     width="120">
+     width="193">
         {128.1, 128.1, 15.4}
     </text>
-    <text
+ <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
      layout="topleft"
-     left="16"
+     left="10"
      name="select_object_label"
-     top="82"
+     top_pad="5"
      width="220">
         Click the button then the object:
     </text>
@@ -118,15 +121,16 @@
      name="pick_btn"
      picture_style="true"
      tool_tip="Object Picker - Identify an object as the subject of this report"
-     top_delta="14"
+     top_pad="0"
      width="32" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
-     left_pad="5"
+     left="48"
      name="object_name_label"
      top_delta="0"
      width="60">
@@ -141,7 +145,7 @@
      left_pad="6"
      name="object_name"
      top_delta="0"
-     width="109">
+     width="157">
         Consetetur Sadipscing
     </text>
     <text
@@ -149,10 +153,11 @@
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
-     left="53"
+     left="48"
      name="owner_name_label"
-     top="112"
+     top_pad="5"
      width="60">
         Owner:
     </text>
@@ -165,17 +170,17 @@
      left_pad="6"
      name="owner_name"
      top_delta="0"
-     width="109">
+     width="157">
         Hendrerit Vulputate
-    </text>
+    </text> 
     <combo_box
      height="20"
      layout="topleft"
-     left="16"
+     left="10"
      name="category_combo"
      tool_tip="Category -- select the category that best describes this report"
-     top="156"
-     width="356">
+     top_pad="10"
+     width="265">
         <combo_box.item
          label="Select category"
          name="Select_category"
@@ -338,156 +343,161 @@
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
      left_delta="0"
      name="abuser_name_title"
-     top_pad="10"
-     width="180">
+     top_pad="12"
+     width="265">
         Abuser name:
     </text>
     <line_editor
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     height="16"
+     height="20"
      layout="topleft"
      left_delta="0"
      max_length="32"
      name="abuser_name_edit"
      top_pad="2"
-     width="180" />
+     width="170" />
     <button
      height="20"
-     label="Choose Resident"
+     font="SansSerifSmall"
+     label="Choose"
      layout="topleft"
-     left_pad="10"
+     left_pad="5"
      name="select_abuser"
      tool_tip="Select the name of the abuser from a list"
-     top_delta="-2"
-     width="160" />
+     top_delta="0"
+     width="90" />
     <check_box
-     height="16"
+     height="20"
      label="Don&apos;t know abuser&apos;s name"
      layout="topleft"
-     left="13"
+     left="10"
      name="omit_abuser_name"
      tool_tip="Check this if you are unable to provide the abuser&apos;s name"
-     top="224"
+     top_pad="2"
      visible="false"
-     width="116" />
+     width="250" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
      left_delta="3"
      name="abuser_name_title2"
-     top_pad="8"
-     width="180">
+     top_pad="10"
+     width="265">
         Location of Abuse:
     </text>
     <line_editor
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     height="16"
+     height="20"
      layout="topleft"
-     left_delta="0"
+     left="10"
      max_length="256"
      name="abuse_location_edit"
      top_pad="2"
-     width="356" />
+     width="265" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
      left_delta="0"
      name="sum_title"
-     top_pad="8"
-     width="180">
+     top_pad="10"
+     width="265">
         Summary:
     </text>
     <line_editor
      border_style="line"
      border_thickness="1"
      follows="left|top"
-     height="16"
+     height="20"
      layout="topleft"
      left_delta="0"
      max_length="64"
      name="summary_edit"
      top_pad="2"
-     width="356" />
+     width="265" />
     <text
      type="string"
      length="1"
      follows="left|top"
      height="16"
+     font.style="BOLD"
      layout="topleft"
      left_delta="0"
      name="dscr_title"
-     top_pad="8"
-     width="180">
+     top_pad="10"
+     width="50">
         Details:
     </text>
     <text
      type="string"
      length="1"
      follows="left|top"
-     height="48"
+     height="16"
      layout="topleft"
-     left_delta="54"
+     left_pad="5"
      name="bug_aviso"
      top_delta="0"
-     width="308">
-        Please be specific about the date, location, nature of
-abuse, relevant chat/IM text, and select the object
-if possible.
+     width="200">
+        Please be as specific as possible.
     </text>
     <text_editor
      follows="left|top"
-     height="146"
+     height="50"
      layout="topleft"
-     left="16"
+     left="10"
      max_length="800"
      mouse_opaque="false"
      name="details_edit"
-     top="386"
-     width="356"
+     top_pad="2"
+     width="265"
      word_wrap="true" />
     <text
      type="string"
      length="1"
      follows="left|top"
-     height="16"
+     height="50"
      layout="topleft"
      left_delta="0"
+     font.style="BOLD"
      name="incomplete_title"
      top_pad="8"
-     width="342">
+     word_wrap="true"
+     width="265">
         Note: Incomplete reports will not be investigated.
     </text>
     <button
-     bottom="580"
+     bottom="590"
      follows="right|bottom"
      height="20"
      label="Cancel"
      label_selected="Cancel"
      layout="topleft"
      name="cancel_btn"
-     right="373"
-     width="150" />
+     right="275"
+     width="130" />
     <button
-     bottom="580"
+     bottom="590"
      follows="right|bottom"
      height="20"
      label="Report Abuse"
      label_selected="Report Abuse"
      layout="topleft"
      name="send_btn"
-     right="217"
-     width="150" />
+     right="140"
+     width="130" />
 </floater>
-- 
cgit v1.2.3