diff options
| author | Kitty Barnett <develop@catznip.com> | 2012-12-03 01:46:26 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2012-12-03 01:46:26 +0100 |
| commit | 1e26dbdcd27a1f29fe249cc7e074e5ede284bac8 (patch) | |
| tree | 8580d1b1919b5b350adea0480aa88e7569bd78cc /indra/llprimitive/llmaterial.h | |
| parent | a0392ec5ec5703bd54bc4e091820d1c1423bbad4 (diff) | |
Started LLMaterialMgr to handle viewer<->region materials communication
* refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead
* replaced "Object editing" results list with information about the active selection instead
Diffstat (limited to 'indra/llprimitive/llmaterial.h')
| -rw-r--r-- | indra/llprimitive/llmaterial.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llprimitive/llmaterial.h b/indra/llprimitive/llmaterial.h index d50ab30195..42e3dd04b9 100644 --- a/indra/llprimitive/llmaterial.h +++ b/indra/llprimitive/llmaterial.h @@ -69,6 +69,9 @@ public: U8 getAlphaMaskCutoff() const { return mAlphaMaskCutoff; } void setAlphaMaskCutoff(U8 cutoff) { mAlphaMaskCutoff = cutoff; } + bool isNull() const; + static const LLMaterial null; + protected: LLUUID mNormalID; F32 mNormalOffsetX; |