Merge

1 files changed, 49 insertions, 0 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_bumps.xml b/indra/newview/skins/default/xui/en/floater_bumps.xml
new file mode 100644
index 0000000000..303c28d7c8
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_bumps.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ legacy_header_height="18"
+ height="180"
+ layout="topleft"
+ name="floater_bumps"
+ help_topic="floater_bumps"
+ save_rect="true"
+ title="BUMPS, PUSHES &amp; HITS"
+ width="400">
+    <floater.string
+     name="none_detected">
+        None detected
+    </floater.string>
+    <floater.string
+     name="bump">
+        [TIME]  [FIRST] [LAST] bumped you
+    </floater.string>
+    <floater.string
+     name="llpushobject">
+        [TIME]  [FIRST] [LAST] pushed you with a script
+    </floater.string>
+    <floater.string
+     name="selected_object_collide">
+        [TIME]  [FIRST] [LAST] hit you with an object
+    </floater.string>
+    <floater.string
+     name="scripted_object_collide">
+        [TIME]  [FIRST] [LAST] hit you with a scripted object
+    </floater.string>
+    <floater.string
+     name="physical_object_collide">
+        [TIME]  [FIRST] [LAST] hit you with a physical object
+    </floater.string>
+    <floater.string
+     name="timeStr">
+        [[hour,datetime,slt]:[min,datetime,slt]]
+    </floater.string>
+    <scroll_list
+     draw_border="false"
+     follows="left|top|right|bottom"
+     height="152"
+     layout="topleft"
+     left="6"
+     multi_select="true"
+     name="bump_list"
+     top="20"
+     width="388" />
+</floater>