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.h | |
| parent | 64581fb8d001262d2e34b3e3b653e485555d9c9c (diff) | |
| parent | e2b56c9bbafdf9908361f43d68b4ce0c56e90d85 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to 'indra/newview/llparcelselection.h')
| -rw-r--r-- | indra/newview/llparcelselection.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llparcelselection.h b/indra/newview/llparcelselection.h index 1cbdfc6f74..06d9141efb 100644 --- a/indra/newview/llparcelselection.h +++ b/indra/newview/llparcelselection.h @@ -35,6 +35,7 @@ class LLParcel; class LLParcelSelection : public LLRefCount { friend class LLViewerParcelMgr; + friend class LLSafeHandle<LLParcelSelection>; protected: ~LLParcelSelection(); @@ -61,8 +62,6 @@ public: // Is the entire parcel selected, or just a part? BOOL getWholeParcelSelected() const; - static LLParcelSelection* getNullParcelSelection(); - private: void setParcel(LLParcel* parcel) { mParcel = parcel; } @@ -73,8 +72,6 @@ private: S32 mSelectedSelfCount; S32 mSelectedOtherCount; S32 mSelectedPublicCount; - - static LLPointer<LLParcelSelection> sNullSelection; }; typedef LLSafeHandle<LLParcelSelection> LLParcelSelectionHandle; |