merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3

ignore-dead-branch

1 files changed, 62 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_lsl_guide.xml b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
new file mode 100644
index 0000000000..ce6b0efd03
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_lsl_guide.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ can_resize="true"
+ follows="left|top"
+ height="400"
+ layout="topleft"
+ min_height="271"
+ min_width="350"
+ name="script ed float"
+ save_rect="true"
+ title="LSL Wiki"
+ width="370">
+    <check_box
+     follows="top|left"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Follow cursor"
+     layout="topleft"
+     left="10"
+     name="lock_check"
+     top="25"
+     width="60" />
+    <combo_box
+     allow_text_entry="true"
+     follows="top|left|right"
+     font="SansSerif"
+     halign="center"
+     height="20"
+     label="Lock"
+     layout="topleft"
+     left_pad="40"
+     name="history_combo"
+     top_delta="0"
+     width="90" />
+    <button
+     follows="top|right"
+     height="20"
+     label="Back"
+     layout="topleft"
+     left_pad="5"
+     name="back_btn"
+     top_delta="0"
+     width="70" />
+    <button
+     follows="top|right"
+     height="20"
+     label="Forward"
+     layout="topleft"
+     left_pad="5"
+     name="fwd_btn"
+     top_delta="0"
+     width="70" />
+    <web_browser
+     bottom="390"
+     follows="left|right|top|bottom"
+     layout="topleft"
+     left="10"
+     name="lsl_guide_html"
+     right="-10"
+     top="50" />
+</floater>