diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-12-17 00:09:01 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-12-17 00:09:01 +0100 |
| commit | 5824e60c595a3004ba24c250cad72a5eace8013f (patch) | |
| tree | a3f6839f56c3b19b59eb3509423354ebd12d4814 /indra/llprimitive/llmaterialid.h | |
| parent | a18ea9d92923e331c0a3e179e126659e694b1c07 (diff) | |
| parent | 74d3dc41fb7e24410ba052a9c5ce2867fbdb9c0a (diff) | |
Merge with viewer-materials tip
Diffstat (limited to 'indra/llprimitive/llmaterialid.h')
| -rw-r--r-- | indra/llprimitive/llmaterialid.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h index ffefc9f11c..9db4065302 100644 --- a/indra/llprimitive/llmaterialid.h +++ b/indra/llprimitive/llmaterialid.h @@ -29,6 +29,8 @@ #define MATERIAL_ID_SIZE 16 +#include <string> + class LLMaterialID { public: @@ -41,8 +43,13 @@ public: bool operator == (const LLMaterialID& pOtherMaterialID) const; bool operator != (const LLMaterialID& pOtherMaterialID) const; - LLMaterialID& operator = (const LLMaterialID& pOtherMaterialID); + bool operator < (const LLMaterialID& pOtherMaterialID) const; + bool operator <= (const LLMaterialID& pOtherMaterialID) const; + bool operator > (const LLMaterialID& pOtherMaterialID) const; + bool operator >= (const LLMaterialID& pOtherMaterialID) const; + + LLMaterialID& operator = (const LLMaterialID& pOtherMaterialID); bool isNull() const; |