diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-11-29 14:47:09 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-11-29 14:47:09 -0500 |
| commit | e3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (patch) | |
| tree | f912ed486a465f5cc0aee5c73c9cb70c195e8c4d /indra/newview/llparcelselection.cpp | |
| parent | 1693ccba58eef676df1f91e50627545ac35bb819 (diff) | |
| parent | bf98e092e53ed228b3cb50fe816058c5a7817329 (diff) | |
DRTVWR-418: Merge from latest viewer-release
Diffstat (limited to 'indra/newview/llparcelselection.cpp')
| -rw-r--r-- | indra/newview/llparcelselection.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/indra/newview/llparcelselection.cpp b/indra/newview/llparcelselection.cpp index 4d1901adc9..5c62159b93 100644 --- a/indra/newview/llparcelselection.cpp +++ b/indra/newview/llparcelselection.cpp @@ -31,13 +31,6 @@ #include "llparcel.h" -// static -LLPointer<LLParcelSelection> LLParcelSelection::sNullSelection; - -template<> - const LLSafeHandle<LLParcelSelection>::NullFunc - LLSafeHandle<LLParcelSelection>::sNullFunc = LLParcelSelection::getNullParcelSelection; - // // LLParcelSelection // @@ -87,14 +80,3 @@ bool LLParcelSelection::hasOthersSelected() const { return mSelectedOtherCount != 0; } - -// static -LLParcelSelection* LLParcelSelection::getNullParcelSelection() -{ - if (sNullSelection.isNull()) - { - sNullSelection = new LLParcelSelection; - } - - return sNullSelection; -} |