diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-11-24 06:56:57 -0500 |
| commit | b69be18d7b41b639d3c62354ca7ab6e3bc32f1cb (patch) | |
| tree | 355347be68e29f59ad5299abd9b42423359eb60e /indra/newview/llface.h | |
| parent | fb605a047aa1c6b293b9546a06ac800c53d109ba (diff) | |
| parent | 8c86a08e72708e96dcf67830518187a00478bbfd (diff) | |
merge changes for vmrg-193
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(); } } }; |