summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-02-07 14:13:57 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-02-07 14:13:57 -0800
commitfa46459cdb6d63fea6a76d8c11eee5503edf5bb1 (patch)
treee7d969b2e8c4829e28fdceb844e57ee29fed874c /indra/newview/skins/default/xui
parentcdcbc4c026f43c4a19b509e5d8754fc54da9c2f6 (diff)
PATH-245: Hooking the characters floater up to the character service. Also, adding in an additional state to handle the floater when the service does not exist.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
index 9ae28d6a15..5938342556 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_characters.xml
@@ -19,6 +19,7 @@
<floater.string name="characters_messaging_fetch_error">Error detected while querying for pathfinding characters</floater.string>
<floater.string name="characters_messaging_complete_none_found">No pathfinding characters</floater.string>
<floater.string name="characters_messaging_complete_available">[NUM_SELECTED] characters selected out of [NUM_TOTAL]</floater.string>
+ <floater.string name="characters_messaging_service_not_available">Required capability is not available in current region</floater.string>
<scroll_list
column_padding="0"
draw_heading="true"
@@ -52,8 +53,8 @@
width="64" />
</scroll_list>
<text
- height="13"
- word_wrap="false"
+ height="26"
+ word_wrap="true"
use_ellipses="false"
type="string"
text_color="LabelTextColor"
@@ -62,7 +63,7 @@
layout="topleft"
name="characters_status"
top="161"
- width="500">
+ width="240">
Characters:
</text>
<button
@@ -113,7 +114,7 @@
layout="topleft"
name="actions_label"
top_pad="12"
- width="910">
+ width="242">
Actions on selected characters:
</text>
<check_box