diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 12:42:32 -0700 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-07 12:42:32 -0700 |
| commit | 1f5f0a4b060ca22ccc6b5764cb8f947d68ec87e2 (patch) | |
| tree | 240f028339bc20371e73bda0161c5e5b44a6f6e8 /indra/newview/llspatialpartition.h | |
| parent | 792f606093daf89873342d3465eda296e329d407 (diff) | |
| parent | 29246e8a1fa1f8ebec307cc32017910d1e4ab5f4 (diff) | |
Merge vwr-dev-mat
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rwxr-xr-x | indra/newview/llspatialpartition.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 7c0be549df..bf32440848 100755 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -119,8 +119,8 @@ public: LL_ALIGN_16(LLFace* mFace); //associated face F32 mDistance; U32 mDrawMode; - LLMaterialPtr mMaterial; // If this is null, the following parameters are unused. + U32 mShaderMask; LLPointer<LLViewerTexture> mSpecularMap; const LLMatrix4* mSpecularMapMatrix; LLPointer<LLViewerTexture> mNormalMap; |