diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-30 15:40:22 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-30 15:40:22 -0400 |
| commit | b9a2a8b22395253af1508c09eca3c55aa54ee58e (patch) | |
| tree | 2344dfc3ce4d2fb2df3134a3f09c481b1a31bc28 /indra/newview/llselectmgr.cpp | |
| parent | 71ffed27c77e787cafe04ddf19df27495255cae5 (diff) | |
| parent | e9fe0714ad422c2b9250c8ce13d3b2837dff5430 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64-xcode-8.3
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
| -rw-r--r-- | indra/newview/llselectmgr.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index ee7c22800a..cbcd905ab6 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -132,11 +132,6 @@ LLColor4 LLSelectMgr::sHighlightParentColor; LLColor4 LLSelectMgr::sHighlightChildColor; LLColor4 LLSelectMgr::sContextSilhouetteColor; -static LLObjectSelection *get_null_object_selection(); -template<> - const LLSafeHandle<LLObjectSelection>::NullFunc - LLSafeHandle<LLObjectSelection>::sNullFunc = get_null_object_selection; - //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // struct LLDeRezInfo // @@ -156,27 +151,15 @@ struct LLDeRezInfo // -static LLPointer<LLObjectSelection> sNullSelection; - // // Functions // void LLSelectMgr::cleanupGlobals() { - sNullSelection = NULL; LLSelectMgr::getInstance()->clearSelections(); } -LLObjectSelection *get_null_object_selection() -{ - if (sNullSelection.isNull()) - { - sNullSelection = new LLObjectSelection; - } - return sNullSelection; -} - // Build time optimization, generate this function once here template class LLSelectMgr* LLSingleton<class LLSelectMgr>::getInstance(); //----------------------------------------------------------------------------- |