diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-02-08 22:10:07 +0000 |
| commit | a1c2d021261d38de7dabd0863dd264ac3bf50523 (patch) | |
| tree | 3b09e4412ccac313dd93adff2d14d1c766b5686a /indra/llrender/llrender.h | |
| parent | c8d8414b3b2e83fbaffd6e48f55ca14a3cb27ca4 (diff) | |
| parent | 0a7bc35335666cc310ef900d4e4144c658b92522 (diff) | |
Merged in graham_linden/viewer-eep-fixes (pull request #273)
SL-10478, SL-10486, SL-10501, SL-10415, SL-10487
Diffstat (limited to 'indra/llrender/llrender.h')
| -rw-r--r-- | indra/llrender/llrender.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index a79db80ebe..012a8da4ce 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -229,6 +229,7 @@ public: void enable(); void disable(); void setDiffuse(const LLColor4& diffuse); + void setDiffuseB(const LLColor4& diffuse); void setAmbient(const LLColor4& ambient); void setSpecular(const LLColor4& specular); void setPosition(const LLVector4& position); @@ -245,6 +246,7 @@ protected: S32 mIndex; bool mEnabled; LLColor4 mDiffuse; + LLColor4 mDiffuseB; LLColor4 mAmbient; LLColor4 mSpecular; LLVector4 mPosition; |