diff options
author | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-11-08 15:28:13 -0600 |
commit | 0d568ce9f0522eaa21a12fa5fae31f80c59bd947 (patch) | |
tree | 6b849a3b48a35feaeff0278ca8e562359df852e2 /indra/newview/llface.h | |
parent | 28c26cb491305525fb3f24ec2ef3bcb9b1ab8c5f (diff) | |
parent | ef8bdb5d95ebd869279ee4bb0510d54e51ab747f (diff) |
merge
Diffstat (limited to 'indra/newview/llface.h')
-rw-r--r-- | indra/newview/llface.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index b5eaeecd60..82e4ab61b7 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -329,13 +329,9 @@ public: { return lhs->getTexture() < rhs->getTexture(); } - else if (lte->getBumpShinyFullbright() != rte->getBumpShinyFullbright()) - { - return lte->getBumpShinyFullbright() < rte->getBumpShinyFullbright(); - } else { - return lte->getGlow() < rte->getGlow(); + return lte->getBumpShinyFullbright() < rte->getBumpShinyFullbright(); } } }; |