diff options
author | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-01 17:45:04 +0000 |
commit | 941cb9f4124c9ccfd5c845bc94639fa46df12c3d (patch) | |
tree | e0f525e7bd6cc76d89b2df69c6f1554d191561e8 /indra/newview/lltoolbrush.h | |
parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/lltoolbrush.h')
-rw-r--r-- | indra/newview/lltoolbrush.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/lltoolbrush.h b/indra/newview/lltoolbrush.h index c46037a8f7..70e34725af 100644 --- a/indra/newview/lltoolbrush.h +++ b/indra/newview/lltoolbrush.h @@ -46,7 +46,7 @@ class LLViewerRegion; // A toolbrush that modifies the land. //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -class LLToolBrushLand : public LLTool, public LLEditMenuHandler +class LLToolBrushLand : public LLTool, public LLEditMenuHandler, public LLSingleton<LLToolBrushLand> { typedef std::set<LLViewerRegion*> region_list_t; @@ -103,6 +103,5 @@ protected: region_list_t mLastAffectedRegions; }; -extern LLToolBrushLand *gToolLand; #endif // LL_LLTOOLBRUSH_H |