diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-08-19 16:34:34 -0500 |
| commit | 233e42b3314c17b2e24334587d960af6e3dc963c (patch) | |
| tree | 480e571bf913bb0743c3c6c6ce846a69aa405504 /indra/newview/llface.h | |
| parent | 0e496309d6cb7581c9f69b7da244699c382750ac (diff) | |
| parent | 80398b3ccb0c4a6ff3ac20b3565619fe5cecc2f9 (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(); } } }; |