diff options
| author | callum_linden <none@none> | 2013-05-16 12:06:29 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2013-05-16 12:06:29 -0700 |
| commit | 68c6ad909c4878f5627fa485efaa735c2ea13587 (patch) | |
| tree | 1abb1dd9a3f22952a9e06d45cb05bee4e004fe46 /indra/newview/llmaterialmgr.h | |
| parent | b3df764bd3c461df49f0f2289b66c87a76e71d34 (diff) | |
| parent | 666896ac4efa0575c82cd58c9fe041f354ccbbfc (diff) | |
Merge
Diffstat (limited to 'indra/newview/llmaterialmgr.h')
| -rw-r--r-- | indra/newview/llmaterialmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llmaterialmgr.h b/indra/newview/llmaterialmgr.h index 922b16f1cf..b5ba8ab680 100644 --- a/indra/newview/llmaterialmgr.h +++ b/indra/newview/llmaterialmgr.h @@ -96,7 +96,7 @@ protected: const struct LLMaterialMgr::TEMaterialPair& rhs) { return (lhs.materialID < rhs.materialID) ? TRUE : - (lhs.te < rhs.te) ? TRUE : FALSE; + (lhs.te < rhs.te) ? TRUE : FALSE; } typedef std::map<TEMaterialPair, get_callback_te_t*> get_callback_te_map_t; |