summaryrefslogtreecommitdiff
path: root/indra/newview/llface.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-12 14:38:45 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-12 14:38:45 +0300
commit36d5c91f7c19d85ca07d9e96357406e74c812687 (patch)
treea27fdfb4da0b08762b010aa4e626b9b8b9125e23 /indra/newview/llface.h
parenta40be985cc099dfe607c6f367c3dd690f21660fe (diff)
parent809a7a3b78f5f14ef22d3a8725e958b1705bd102 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llface.h')
-rw-r--r--indra/newview/llface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h
index 02cc2af433..b20ecfe2b8 100644
--- a/indra/newview/llface.h
+++ b/indra/newview/llface.h
@@ -279,7 +279,7 @@ public:
{
bool operator()(const LLFace* const& lhs, const LLFace* const& rhs)
{
- return lhs->mDistance > rhs->mDistance; // farthest = first
+ return !lhs || (rhs && (lhs->mDistance > rhs->mDistance)); // farthest = first
}
};