SL-19753 PBR Some changes to the right-click menu

2 files changed, 14 insertions, 37 deletions

diff --git a/indra/newview/skins/default/xui/en/menu_attachment_self.xml b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
index 630a1981df..943bfb8122 100644
--- a/indra/newview/skins/default/xui/en/menu_attachment_self.xml
+++ b/indra/newview/skins/default/xui/en/menu_attachment_self.xml
@@ -13,7 +13,7 @@
          function="EnableEdit" />
     </menu_item_call>
     <menu_item_call
-     label="Edit PBR Material"
+     label="Edit PBR material"
      name="EditGLTFMaterial">
         <menu_item_call.on_click
          function="Object.EditGLTFMaterial" />
@@ -21,14 +21,6 @@
          function="Object.EnableEditGLTFMaterial"/>
     </menu_item_call>
     <menu_item_call
-     label="Save material to inventory"
-     name="SaveGLTFMaterial">
-        <menu_item_call.on_click
-         function="Object.SaveGLTFMaterial" />
-        <menu_item_call.on_enable
-         function="Object.EnableSaveGLTFMaterial"/>
-    </menu_item_call>
-    <menu_item_call
      enabled="false"
      label="Detach item"
      layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml
index 6d37c15815..c4fa073999 100644
--- a/indra/newview/skins/default/xui/en/menu_object.xml
+++ b/indra/newview/skins/default/xui/en/menu_object.xml
@@ -22,30 +22,14 @@
         function="EnableEdit"/>
   </menu_item_call>
   <menu_item_call
-      label="Edit PBR Material"
+      label="Edit PBR material"
       name="EditGLTFMaterial">
     <menu_item_call.on_click
         function="Object.EditGLTFMaterial" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
         function="Object.EnableEditGLTFMaterial"/>
   </menu_item_call>
   <menu_item_call
-      label="Save material to inventory"
-      name="SaveGLTFMaterial">
-    <menu_item_call.on_click
-        function="Object.SaveGLTFMaterial" />
-    <menu_item_call.on_enable
-        function="Object.EnableSaveGLTFMaterial"/>
-  </menu_item_call>
-  <menu_item_call
-      label="Build"
-      name="Build">
-    <menu_item_call.on_click
-        function="Object.Build" />
-    <menu_item_call.on_enable
-        function="EnableEdit"/>
-  </menu_item_call>
-  <menu_item_call
       enabled="false"
       label="Open"
       name="Open">
@@ -54,26 +38,27 @@
     <menu_item_call.on_enable
         function="Object.EnableOpen" />
   </menu_item_call>
+  <menu_item_separator layout="topleft" />
   <menu_item_call
       enabled="false"
-      label="Sit Here"
+      label="Sit here"
       name="Object Sit">
     <menu_item_call.on_click
         function="Object.SitOrStand" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
         function="Object.EnableSit" />
   </menu_item_call>
   <menu_item_call
       enabled="false"
-      label="Stand Up"
+      label="Stand up"
       name="Object Stand Up">
     <menu_item_call.on_click
         function="Object.SitOrStand" />
-    <menu_item_call.on_enable
+    <menu_item_call.on_visible
         function="Object.EnableStandUp" />
   </menu_item_call>
   <menu_item_call
-      label="Object Profile"
+      label="Object profile"
       name="Object Inspect">
     <menu_item_call.on_click
         function="Object.Inspect" />
@@ -81,13 +66,13 @@
         function="Object.EnableInspect" />
   </menu_item_call>
   <menu_item_call
-      label="Zoom In"
+      label="Zoom in"
       name="Zoom In">
     <menu_item_call.on_click
         function="Object.ZoomIn" />
   </menu_item_call>
   <menu_item_call
-      label="Show in linksets"
+      label="Show in Region Objects"
       name="show_in_linksets">
     <menu_item_call.on_click
         function="Pathfinding.Linksets.Select" />
@@ -108,7 +93,7 @@
   </menu_item_call>
   <menu_item_separator layout="topleft" />
   <context_menu
-      label="Put On"
+      label="Put on"
       name="Put On" >
     <menu_item_call
         enabled="false"
@@ -185,7 +170,7 @@
   </menu_item_call>
   <menu_item_call
       enabled="false"
-      label="Take Copy"
+      label="Take copy"
       name="Take Copy">
     <menu_item_call.on_click
         function="Tools.TakeCopy" />
@@ -223,7 +208,7 @@
        layout="topleft" />
   <menu_item_call
      enabled="false"
-     label="Block Particle Owner"
+     label="Block particle owner"
      name="Mute Particle">
     <menu_item_call.on_click
      function="Particle.Mute" />