diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-08-31 13:47:47 -0700 |
| commit | 30ff6cabd61f2f083df5df1e6e70cc94742af477 (patch) | |
| tree | 631935f1cf59d19a91cdad65e9a75fe825afda7d /indra/newview/skins/default/xui/en/floater_bumps.xml | |
| parent | ff11d74820c89822cd067b51727d9df1dc87d0d0 (diff) | |
| parent | 3ac3a4b206c08ed06b889bdaa24074b6aa0e020a (diff) | |
Merge with trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_bumps.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_bumps.xml | 47 |
1 files changed, 47 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..4fb2fe24cc --- /dev/null +++ b/indra/newview/skins/default/xui/en/floater_bumps.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<floater + height="180" + layout="topleft" + name="floater_bumps" + save_rect="true" + title="Bumps, Pushes & 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> |