summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-27 13:30:01 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-27 13:30:01 -0700
commit01545997da201e04731b14eb720765a19470974d (patch)
tree297b386d3e27b7afdc94443733749450e711a5c4 /indra/newview/skins/default/xui
parenta818cd4f7336ed9b33dacd91fcaf5239a8be813d (diff)
PATH-788: Adding more state information for the rebake region button to capture and display the rebaking states. Also, altering how the stop flying button works so that it does not hide the entire panel.
Diffstat (limited to 'indra/newview/skins/default/xui')
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml12
-rw-r--r--indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml18
2 files changed, 27 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index b09fb7bbe8..ea06e3a321 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5853,6 +5853,18 @@ This area has building disabled. You can&apos;t build or rez objects here.
</notification>
<notification
+ icon="alertmodal.tga"
+ name="PathfindingCannotRebakeNavmesh"
+ type="alertmodal">
+ <unique/>
+ You are not allowed to rebake the navmesh at the current time.
+ <usetemplate
+ name="okbutton"
+ yestext="OK"
+ />
+ </notification>
+
+ <notification
icon="notify.tga"
name="SeeAvatars"
persist="true"
diff --git a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
index c7bf91efb4..ddfba4c43d 100644
--- a/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
+++ b/indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml
@@ -17,7 +17,19 @@
top="2"
visible="false"
enabled="true"
- width="113" />
+ width="120" />
+ <button
+ follows="left|bottom"
+ height="19"
+ label="Sending rebake request"
+ layout="topleft"
+ left="10"
+ name="navmesh_btn_sending"
+ tool_tip="Sending rebake request"
+ top="2"
+ visible="false"
+ enabled="false"
+ width="120" />
<button
follows="left|bottom"
height="19"
@@ -25,10 +37,10 @@
layout="topleft"
left="10"
name="navmesh_btn_baking"
- tool_tip="Region is cleaning up."
+ tool_tip="Region is cleaning."
top="2"
visible="false"
enabled="false"
- width="113" />
+ width="120" />
</panel>