diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-20 18:56:43 -0500 |
commit | 492f820c6b8a164cb201fed232e40e743e8e38c4 (patch) | |
tree | 7d360ddc2ff2288d1ec8163b6215cf9c81031b51 /indra/newview/llspatialpartition.h | |
parent | 1c58b3b18ea732e0032e70ae6dc9c8ec2f2834b4 (diff) | |
parent | 34c01b6b1ff758463dcdff19782e5af668699304 (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; |