summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-02-14 19:33:33 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-02-14 19:33:33 -0800
commit8cd7bb47c2d9c833129b76cdc09d69aa35654fa5 (patch)
treefa53068d025be7b8a9bb796f8478d4268eda91f1 /indra/newview/skins/default/xui
parentd4f02b1cadd9ae825c281b4f0da3c90807b90dd3 (diff)
PATH-297: Initial layout and basic implementation for the pathfinding basic floater.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml58
-rw-r--r--indra/newview/skins/default/xui/en/floater_pathfinding_console.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml14
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
4 files changed, 68 insertions, 8 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
new file mode 100644
index 0000000000..e21b6c842f
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_basic.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ open_positioning="cascading"
+ can_tear_off="false"
+ height="204"
+ layout="topleft"
+ name="floater_pathfinding_basic"
+ help_topic="floater_pathfinding_basic"
+ reuse_instance="false"
+ save_rect="false"
+ single_instance="true"
+ title="Basic pathfinding setup"
+ width="312">
+ <text
+ height="13"
+ word_wrap="true"
+ use_ellipses="false"
+ type="string"
+ text_color="LabelTextColor"
+ length="1"
+ follows="left|top"
+ layout="topleft"
+ left="15"
+ top="15"
+ width="289">
+ Permit object / terrain changes:
+ </text>
+ <button
+ follows="left|top"
+ height="22"
+ label="Unfreeze"
+ layout="topleft"
+ name="enter_unfrozen_mode"
+ width="116"/>
+ <text
+ height="82"
+ word_wrap="true"
+ use_ellipses="false"
+ type="string"
+ text_color="LabelTextColor"
+ length="1"
+ follows="left|top"
+ layout="topleft"
+ line_spacing.multiple="1.5"
+ left="15"
+ top_pad="23"
+ width="289">
+ In unfrozen mode, you can move and make changes to objects and terrain. When you are finished, click the Freeze button. It may require a few minutes to process your changes.
+ </text>
+ <button
+ follows="left|top"
+ height="22"
+ label="Freeze"
+ layout="topleft"
+ name="enter_frozen_mode"
+ top_pad="0"
+ width="116"/>
+</floater>
diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
index 5aa53d0f93..3fe3dfe963 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_console.xml
@@ -9,7 +9,7 @@
reuse_instance="true"
save_rect="true"
single_instance="true"
- title="Pathfinding"
+ title="Pathfinding edit / test"
width="455">
<floater.string name="navmesh_fetch_initial"></floater.string>
<floater.string name="navmesh_fetch_inprogress">Downloading the navmesh ...</floater.string>
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 47d6f36e1b..c4a95ce25e 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -934,21 +934,21 @@
<menu
create_jump_keys="true"
label="Pathfinding"
- name="Pathfindubg"
+ name="Pathfinding"
tear_off="false">
<menu_item_call
- label="Edit/Test..."
- name="pathfinding_console_menu_item">
+ label="Basic setup..."
+ name="pathfinding_basic_menu_item">
<menu_item_call.on_click
function="Floater.ToggleOrBringToFront"
- parameter="pathfinding_console" />
+ parameter="pathfinding_basic" />
</menu_item_call>
<menu_item_call
- label="Characters..."
- name="pathfinding_characters_menu_item">
+ label="Edit / test..."
+ name="pathfinding_console_menu_item">
<menu_item_call.on_click
function="Floater.ToggleOrBringToFront"
- parameter="pathfinding_characters" />
+ parameter="pathfinding_console" />
</menu_item_call>
</menu>
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 793893f540..02a07c9f02 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3696,6 +3696,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Outbox_Label">Merchant outbox</string>
<string name="Command_Pathfinding_Label">Pathfinding</string>
<string name="Command_People_Label">People</string>
+ <string name="Command_PF_Basic_Label">Pathfinding Basic</string>
<string name="Command_PF_Characters_Label">Pathfinding Characters</string>
<string name="Command_PF_Linksets_Label">Pathfinding Linksets</string>
<string name="Command_Picks_Label">Picks</string>
@@ -3725,6 +3726,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_Outbox_Tooltip">Transfer items to your marketplace for sale</string>
<string name="Command_Pathfinding_Tooltip">Information about pathfinding</string>
<string name="Command_People_Tooltip">Friends, groups, and nearby people</string>
+ <string name="Command_PF_Basic_Tooltip">Manipulation of pathfinding frozen/unfrozen state</string>
<string name="Command_PF_Characters_Tooltip">Manipulation of pathfinding characters</string>
<string name="Command_PF_Linksets_Tooltip">Manipulation of pathfinding linksets</string>
<string name="Command_Picks_Tooltip">Places to show as favorites in your profile</string>