Merge branch 'develop' into rlva/base

1 files changed, 28 insertions, 3 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_settings_debug.xml b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
index a93be6a18d..0b8190df7e 100644
--- a/indra/newview/skins/default/xui/en/floater_settings_debug.xml
+++ b/indra/newview/skins/default/xui/en/floater_settings_debug.xml
@@ -43,6 +43,20 @@
      label="Setting"
      name="setting" />
   </scroll_list>
+  <button
+   follows="right|bottom"
+   layout="topleft"
+   image_hover_unselected="Toolbar_Middle_Over"
+   image_overlay="Icon_Copy"
+   image_selected="Toolbar_Middle_Selected"
+   image_unselected="Toolbar_Middle_Off"
+   name="copy_btn"
+   tool_tip="Copy to clipboard"
+   top_delta="8"
+   left_pad="10"
+   visible="false"
+   height="20"
+   width="20" />
   <text
    type="string"
    length="1"
@@ -51,12 +65,11 @@
    layout="topleft"
    name="setting_name_txt"
    font="SansSerifSmallBold"
-   top_delta="8"
-   left_pad="10"
+   left_pad="4"
    visible="false"
    use_ellipses="true"
    text_color="White"
-   width="240">
+   width="225">
     Debug setting name
   </text>
   <text_editor
@@ -67,6 +80,7 @@
    name="comment_text"
    follows="left|top"
    width="240"
+   left="320"
    top_delta="20"
    word_wrap="true" />
   <radio_group
@@ -198,4 +212,15 @@
       name="hide_default"
       width="330">
     </check_box>
+    <text_editor
+      read_only="true"
+      visible="false"
+      height="115"
+      layout="topleft"
+      name="llsd_text"
+      follows="left|top"
+      width="240"
+      left="320"
+      top="180"
+      word_wrap="true" />
 </floater>