diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-14 09:52:28 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-14 09:52:28 -0700 |
| commit | 7c6ac0740dac946275ef3f904614688f4b73f850 (patch) | |
| tree | 18446d6a5346400ab2f6ac98fa394446b86156d3 /indra/newview/llpanelenvironment.h | |
| parent | 3dd286064e253097af696068940afe009acc0b2e (diff) | |
SL-1556: Correctly identify when the selected parcel is in another region and display a message about cross region environments.
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index c18092e2e5..fdf0fe46a7 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -52,12 +52,10 @@ public: virtual void refresh() override; - S32 getCurrentParcelId() const { return mCurrentParcelId; } - void setCurrentParcelId(S32 parcel_id) { mCurrentParcelId = parcel_id; } - virtual bool isRegion() const = 0; virtual LLParcel * getParcel() = 0; virtual bool canEdit() = 0; + virtual S32 getParcelId() = 0; protected: LOG_CLASS(LLPanelEnvironmentInfo); @@ -80,12 +78,15 @@ protected: static const std::string PNL_ENVIRONMENT_ALTITUDES; static const std::string PNL_BUTTONS; static const std::string PNL_DISABLED; - + static const std::string TXT_DISABLED; static const std::string STR_LABEL_USEDEFAULT; static const std::string STR_LABEL_USEREGION; static const std::string STR_LABEL_UNKNOWNINV; static const std::string STR_ALTITUDE_DESCRIPTION; + static const std::string STR_NO_PARCEL; + static const std::string STR_CROSS_REGION; + static const std::string STR_LEGACY; static const U32 DIRTY_FLAG_DAYCYCLE; static const U32 DIRTY_FLAG_DAYLENGTH; @@ -94,7 +95,7 @@ protected: static const U32 DIRTY_FLAG_MASK; - void setControlsEnabled(bool enabled); + bool setControlsEnabled(bool enabled); void setApplyProgress(bool started); void setDirtyFlag(U32 flag); void clearDirtyFlag(U32 flag); @@ -121,7 +122,7 @@ protected: void onPickerAssetDownloaded(LLSettingsBase::ptr_t settings); void onEnvironmentReceived(S32 parcel_id, LLEnvironment::EnvironmentInfo::ptr_t envifo); - void refreshFromSource(); + virtual void refreshFromSource() = 0; std::string getInventoryNameForAssetId(LLUUID asset_id); @@ -129,8 +130,10 @@ protected: LLFloaterEditExtDayCycle * getEditFloater(bool create = true); void updateEditFloater(const LLEnvironment::EnvironmentInfo::ptr_t &nextenv); + void setCrossRegion(bool val) { mCrossRegion = val; } + void setNoSelection(bool val) { mNoSelection = val; } + LLEnvironment::EnvironmentInfo::ptr_t mCurrentEnvironment; - S32 mCurrentParcelId; class AltitudeData { @@ -156,9 +159,12 @@ private: typedef boost::signals2::connection connection_t; - connection_t mCommitConnection; - LLHandle<LLFloater> mSettingsFloater; - LLHandle<LLFloater> mEditFloater; - S32 mDirtyFlag; + connection_t mCommitConnection; + LLHandle<LLFloater> mSettingsFloater; + LLHandle<LLFloater> mEditFloater; + S32 mDirtyFlag; + bool mCrossRegion; + bool mNoSelection; + }; #endif // LL_LLPANELEXPERIENCES_H |