diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-10-11 14:35:49 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-10-11 14:35:49 -0400 |
| commit | 0c7bc67814dd4fa347401c24ba0e1be78e4b838f (patch) | |
| tree | 450fc1ce0aff2f2880c32b3ca85161ca0ceff8a6 /indra/newview/llparcelselection.cpp | |
| parent | b6d22de58850fc9a5b34eeb5b7930e5845bfc42d (diff) | |
| parent | 25be14381e29481413c94edf5436c0af715a1578 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/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; -} |