diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-12-05 09:36:41 -0800 |
| commit | 837e4e5165cc3e6595577e90bae240e676be8ffe (patch) | |
| tree | 85c8e8a8cb6adf8abc87fe3a70d4513a1ab625e5 /indra/newview/llface.h | |
| parent | 570d02dc7e41c3e08477e7f759d632db78690eb4 (diff) | |
| parent | 71974461114d81f818f69a4344ce4071c20f331f (diff) | |
Merge with viewer-experience
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(); } } }; |