diff options
| author | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 22:32:17 -0800 |
|---|---|---|
| committer | Palmer Truelson <palmer@lindenlab.com> | 2010-02-23 22:32:17 -0800 |
| commit | 469af6771d757dd951daaed3e2b1d59ee2127c0e (patch) | |
| tree | 298393b5676500a111ee89c1bd7e9be080b7975e /indra | |
| parent | 23ce9d6f40d9d0730f3271fcc5dadeb0d68dcb5b (diff) | |
D'oh. Merge bork.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llrender/llrender.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/llrender/llrender.h b/indra/llrender/llrender.h index 73c628d4b5..a73a128368 100644 --- a/indra/llrender/llrender.h +++ b/indra/llrender/llrender.h @@ -366,9 +366,6 @@ private: eBlendFactor mCurrBlendDFactor; F32 mMaxAnisotropy; - eBlendFactor mCurrBlendSFactor; - eBlendFactor mCurrBlendDFactor; - std::list<LLVector3> mUIOffset; std::list<LLVector3> mUIScale; |