diff options
author | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-11-02 11:46:18 -0500 |
commit | 55f69de90c9b32c7fa25f16ec7d1f41064eff614 (patch) | |
tree | 054b0d99490cc6600b3be0e3cb2aaf7918f3fe50 /indra/newview/llspatialpartition.h | |
parent | 8f47f2222c207938c8fc55158a6fff64ccf1e781 (diff) | |
parent | 1bea08335b6c2fa31f414db2fe7316a118b2ec18 (diff) |
merge
Diffstat (limited to 'indra/newview/llspatialpartition.h')
-rw-r--r-- | indra/newview/llspatialpartition.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 11955540c6..f0c8a372ee 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -93,7 +93,6 @@ public: LLPointer<LLViewerTexture> mTexture; std::vector<LLPointer<LLViewerTexture> > mTextureList; - LLColor4U mGlowColor; S32 mDebugColor; const LLMatrix4* mTextureMatrix; const LLMatrix4* mModelMatrix; |