diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-08 15:39:02 -0500 |
| commit | f076bdf609ec1fe114a7d0222a318483c97c7a26 (patch) | |
| tree | 93dbd2a949d60daaf6aaa025ca7cf036cf90a929 /indra/newview/llface.h | |
| parent | f302e119627090c22325df59c40e1762402a08c6 (diff) | |
| parent | b9439ac006ac64179180ec2a47f6bd92468de455 (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(); } } }; |