diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
commit | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (patch) | |
tree | 96bd0bbc9d7bbe2a6a8d9a543fc581d82fdc1965 /indra/newview/llspatialpartition.h | |
parent | 9ae6672a15ae64dba1d2af774dcde26700fb6126 (diff) | |
parent | 467a8b0441e139773775ecf306f430f44814bff5 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llspatialpartition.h')
-rw-r--r-- | indra/newview/llspatialpartition.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index 7896488379..48070cc438 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -164,8 +164,6 @@ public: static BOOL sNoDelete; //deletion of spatial groups and draw info not allowed if TRUE typedef std::vector<LLPointer<LLSpatialGroup> > sg_vector_t; - typedef std::set<LLPointer<LLSpatialGroup> > sg_set_t; - typedef std::list<LLPointer<LLSpatialGroup> > sg_list_t; typedef std::vector<LLPointer<LLSpatialBridge> > bridge_list_t; typedef std::vector<LLPointer<LLDrawInfo> > drawmap_elem_t; typedef std::map<U32, drawmap_elem_t > draw_map_t; |