diff options
| author | Callum Prentice <callum@gmail.com> | 2017-04-06 17:02:10 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-04-06 17:02:10 -0700 |
| commit | 510a7530969d9818a8ba7f82937afabc6403cc5f (patch) | |
| tree | a444dd6db6802cb8792ae365b4559dc01cc78c3f /indra/newview/llparcelselection.h | |
| parent | aee540787a823cf69c8991481986b8e4889f0267 (diff) | |
| parent | a83d66125012a18a395840d5e81cee08a548f1e9 (diff) | |
Automated merge with head of 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; |