diff options
| author | graham linden <graham@lindenlab.com> | 2013-04-10 10:37:48 -0700 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-04-10 10:37:48 -0700 |
| commit | 5c507f964808c5c4c3586cfa1e4cf4a4c6974b95 (patch) | |
| tree | a3a7cea5f9d7662a9393395c117a1f110ada7aac /indra/newview/llspatialpartition.h | |
| parent | 9e9e0f3ea6dad9d0f553aaeb0819e660e248ad9f (diff) | |
| parent | 41097e74ecea7f99d2e4b0ee03dfa40ed6463f46 (diff) | |
Merged lindenlab/viewer-development-materials into default
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | 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 13196de1ef..bfb2de6ba6 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -120,7 +120,7 @@ public: F32 mDistance; U32 mDrawMode; - LLMaterialID mMaterialID; // If this is null, the following parameters are unused. + LLMaterial* mMaterial; // If this is null, the following parameters are unused. LLPointer<LLViewerTexture> mSpecularMap; const LLMatrix4* mSpecularMapMatrix; LLPointer<LLViewerTexture> mNormalMap; |