summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-23 10:55:41 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-23 10:55:41 -0700
commit9030ecec062cd31ffa6eeffc409eeccb0ad4baa5 (patch)
treeb9a5507c2e82485c7a3c0e7e00f46890db95b62a
parent9ef98bece29b6740e4f779ab6a3534b5b1e7f974 (diff)
NORSPEC-193 NORSPEC-161 add new batch break criterion to CompareBatchBreakerModified and add shortcut for materials info dump
-rwxr-xr-xindra/newview/llvovolume.cpp4
-rwxr-xr-xindra/newview/skins/default/xui/en/menu_viewer.xml3
2 files changed, 6 insertions, 1 deletions
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>