diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-13 16:11:22 -0500 |
commit | c0ca2c62fd6b9a90542907ce46bf1fe0ab379e13 (patch) | |
tree | 69bed5c3a72357e183384917b5495c2990e1ac13 /indra/newview/llspatialpartition.h | |
parent | 19371a9abed3198f9f6083c3b2483e65778e944a (diff) | |
parent | 38c19f4e55c0f6a104de87dfb57313a6c529b4d6 (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; |