diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-16 09:00:39 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-16 09:00:39 -0400 |
| commit | b7d4ba1f086e8a318e389add7c17dcb803689a7d (patch) | |
| tree | abd44fe38364125ba5de0ebe260701a1d25c0645 /indra/newview/llspatialpartition.h | |
| parent | d1f713f30bd4d42fe4696e25c01ab4532ef3b69b (diff) | |
| parent | c72c3691ecf83875d4ee3e0784b3e76cb4b4633a (diff) | |
merge changes for alpha fixes from geenz
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 bfb2de6ba6..426eaa1ce4 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -120,7 +120,7 @@ public: F32 mDistance; U32 mDrawMode; - LLMaterial* mMaterial; // If this is null, the following parameters are unused. + LLMaterialPtr mMaterial; // If this is null, the following parameters are unused. LLPointer<LLViewerTexture> mSpecularMap; const LLMatrix4* mSpecularMapMatrix; LLPointer<LLViewerTexture> mNormalMap; |