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/llselectmgr.h | |
| parent | ecec626dec93524f7ef5831a5ba344d6449b99bc (diff) | |
merge release@83343 skinning-1-merge@83714 -> release
QAR-424
Diffstat (limited to 'indra/newview/llselectmgr.h')
| -rw-r--r-- | indra/newview/llselectmgr.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 570bcef79a..598a962b3c 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -333,7 +333,7 @@ private: typedef LLSafeHandle<LLObjectSelection> LLObjectSelectionHandle; -class LLSelectMgr : public LLEditMenuHandler +class LLSelectMgr : public LLEditMenuHandler, public LLSingleton<LLSelectMgr> { public: static BOOL sRectSelectInclusive; // do we need to surround an object to pick it? @@ -708,8 +708,6 @@ private: LLAnimPauseRequest mPauseRequest; }; -extern LLSelectMgr* gSelectMgr; - // Utilities void dialog_refresh_all(); // Update subscribers to the selection list |