diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2017-04-03 15:53:53 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2017-04-03 15:53:53 -0400 |
| commit | 13f8d512ec58bbbd076217333711d82c7520ac5c (patch) | |
| tree | c0838387c7e0043c18dfa4ab4ec67cc50a960914 /indra/newview/llparcelselection.cpp | |
| parent | 64581fb8d001262d2e34b3e3b653e485555d9c9c (diff) | |
| parent | e2b56c9bbafdf9908361f43d68b4ce0c56e90d85 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
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; -} |