diff options
author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
---|---|---|
committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
commit | ac558e384214e22b4a8da2045854e2180b7428bf (patch) | |
tree | 7de576ff5552cbb9956c6cdf0e4d84b52514316e /indra/newview/llpanelplaces.h | |
parent | 485193c7f530fa3d8574c74304e452ab6d012e41 (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llpanelplaces.h')
-rw-r--r-- | indra/newview/llpanelplaces.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index c3d1b9bc53..27f991c202 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -146,6 +146,10 @@ private: // Information type currently shown in Place Information panel std::string mPlaceInfoType; + // Region and parcel ids, to detect location changes in case of AGENT_INFO_TYPE + LLUUID mRegionId; + S32 mParcelLocalId; + bool isLandmarkEditModeOn; // Holds info whether "My Landmarks" and "Teleport History" tabs have been created. |