PATH-292: Adding better usability and warning notifications for the handling of locked linksets.

2 files changed, 16 insertions, 30 deletions

diff --git a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
index a7c902e45a..e8cfcd30a6 100644
--- a/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
+++ b/indra/newview/skins/default/xui/en/floater_pathfinding_linksets.xml
@@ -32,7 +32,8 @@
   <floater.string name="linkset_use_material_volume">Material volume</floater.string>
   <floater.string name="linkset_use_exclusion_volume">Exclusion volume</floater.string>
   <floater.string name="linkset_use_dynamic_phantom">Dynamic phantom</floater.string>
-  <floater.string name="linkset_is_locked_state">[locked]</floater.string>
+  <floater.string name="linkset_is_locked_state">[restricted]</floater.string>
+  <floater.string name="linkset_choose_use">Choose linkset use...</floater.string>
   <panel
       border="false"
       bevel_style="none"
@@ -373,34 +374,6 @@
         left="18"
         top_pad="17"
         width="199">
-      <combo_box.item
-          label="Choose linkset use..."
-          name="edit_linkset_use_none"
-          value="0" />
-      <combo_box.item
-          label="Walkable"
-          name="edit_linkset_use_walkable"
-          value="1" />
-      <combo_box.item
-          label="Static obstacle"
-          name="edit_linkset_use_static_obstacle"
-          value="2" />
-      <combo_box.item
-          label="Dynamic obstacle"
-          name="edit_linkset_use_dynamic_obstacle"
-          value="3" />
-      <combo_box.item
-          label="Material volume"
-          name="edit_linkset_use_material_volume"
-          value="4" />
-      <combo_box.item
-          label="Exclusion volume"
-          name="edit_linkset_use_exclusion_volume"
-          value="5" />
-      <combo_box.item
-          label="Dynamic phantom"
-          name="edit_linkset_use_dynamic_phantom"
-          value="6" />
     </combo_box>
     <text
         height="13"
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index af75d49353..f70d4db0f2 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -7663,7 +7663,20 @@ The site at &apos;&lt;nolink&gt;[HOST_NAME]&lt;/nolink&gt;&apos; in realm &apos;
       notext="Cancel"
       ignoretext="Confirm before hiding UI"/>
   </notification>
-  
+
+  <notification
+   icon="alertmodal.tga"
+   name="PathfindingLinksets_SetLinksetUseMismatchOnRestricted"
+   type="alertmodal">
+    Some selected linksets cannot be set to be '[REQUESTED_TYPE]' because of permission restrictions on the linkset.  These linksets will be set to be '[RESTRICTED_TYPE]' instead.
+    <tag>confirm</tag>
+    <usetemplate
+     ignoretext="Do you wish to proceed?"
+     name="okcancelignore"
+     notext="Cancel"
+     yestext="OK"/>
+  </notification>
+
   <global name="UnsupportedGLRequirements">
 You do not appear to have the proper hardware requirements for [APP_NAME]. [APP_NAME] requires an OpenGL graphics card that has multitexture support. If this is the case, you may want to make sure that you have the latest drivers for your graphics card, and service packs and patches for your operating system.