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'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>