diff options
author | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-09-26 19:27:10 -0500 |
commit | bd02cdc75f1c752a127d1303527be3a96479af93 (patch) | |
tree | d8503b7c296a4cd4f1aa2954c03ff250beda4254 /indra/newview/llspatialpartition.h | |
parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
parent | 8dbfa022778f2a7fcd5d2b527045724551279412 (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; |