From 9030ecec062cd31ffa6eeffc409eeccb0ad4baa5 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Thu, 23 May 2013 10:55:41 -0700
Subject: NORSPEC-193 NORSPEC-161 add new batch break criterion to
 CompareBatchBreakerModified and add shortcut for materials info dump

---
 indra/newview/llvovolume.cpp                       | 4 ++++
 indra/newview/skins/default/xui/en/menu_viewer.xml | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 24275c57e0..91a5a082c1 100755
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -5003,6 +5003,10 @@ struct CompareBatchBreakerModified
 		{
 			return lte->getMaterialParams() < rte->getMaterialParams();
 		}
+		else if (LLPipeline::sRenderDeferred && (lte->getMaterialParams() == rte->getMaterialParams()) && (lte->getShiny() != rte->getShiny()))
+		{
+			return lte->getShiny() < rte->getShiny();
+		}
 		else
 		{
 			return lhs->getTexture() < rhs->getTexture();
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 500c11da74..b01c3067ff 100755
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -2666,7 +2666,8 @@
             </menu_item_call>
             <menu_item_call
              label="Selected Material Info"
-             name="Selected Material Info">
+             name="Selected Material Info"
+             shortcut="control|alt|shift|M">
                 <menu_item_call.on_click
                  function="Advanced.SelectedMaterialInfo" />
             </menu_item_call>
-- 
cgit v1.2.3