diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-25 14:39:05 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-25 14:39:05 -0500 |
commit | 30d1a2d053fe7d6e0c88928cf51aa73865ee21e8 (patch) | |
tree | 1a878cdf561ed5e2f4ce0edca2986239b9724b18 /indra/newview/llspatialpartition.h | |
parent | b7a349f231977d5917b29faacca143a85d925576 (diff) | |
parent | c54f6cfdc3f44ccb6fee3acd5fa40bd177c67639 (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; |