summaryrefslogtreecommitdiff
path: root/indra/newview/lltoolbrush.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lltoolbrush.h')
-rw-r--r--indra/newview/lltoolbrush.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h
index 738934ebb1..c46037a8f7 100644
--- a/indra/newview/lltoolbrush.h
+++ b/indra/newview/lltoolbrush.h
@@ -40,8 +40,6 @@ class LLSurface;
class LLVector3d;
class LLViewerRegion;
-template<class DATA_TYPE> class LLLinkedList;
-
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLToolBrushLand
//
@@ -50,6 +48,8 @@ template<class DATA_TYPE> class LLLinkedList;
class LLToolBrushLand : public LLTool, public LLEditMenuHandler
{
+ typedef std::set<LLViewerRegion*> region_list_t;
+
public:
LLToolBrushLand();
@@ -80,7 +80,7 @@ protected:
void brush( void );
void modifyLandAtPointGlobal( const LLVector3d &spot, MASK mask );
- void determineAffectedRegions(LLLinkedList<LLViewerRegion>& regions,
+ void determineAffectedRegions(region_list_t& regions,
const LLVector3d& spot) const;
void renderOverlay(LLSurface& land, const LLVector3& pos_region,
const LLVector3& pos_world);
@@ -99,7 +99,8 @@ protected:
BOOL mGotHover;
BOOL mLastShowParcelOwners;
BOOL mBrushSelected;
- LLLinkedList<LLViewerRegion> mLastAffectedRegions;
+ // Order doesn't matter and we do check for existance of regions, so use a set
+ region_list_t mLastAffectedRegions;
};
extern LLToolBrushLand *gToolLand;