diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-24 11:59:28 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-24 11:59:28 -0700 |
| commit | d5f2267369d2695a8aec7c1d0cfa25954ae3c706 (patch) | |
| tree | 28f01231c824b9e42ce82af73b4a2896b4c3c389 /indra/newview/llpanelenvironment.h | |
| parent | d965af2b0cbf62e2e1601f504e0d548da40aa742 (diff) | |
Remove "Commit" from fixed editor. Check isDirty() before replacing or closing fixed editor.
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index 971f12c7e7..6a0c784708 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -44,17 +44,16 @@ class LLPanelEnvironmentInfo : public LLPanel public: LLPanelEnvironmentInfo(); - // LLPanel virtual BOOL postBuild() override; virtual void onOpen(const LLSD& key) override; - // LLView + virtual BOOL isDirty() const override { return getIsDirty(); } virtual void onVisibilityChange(BOOL new_visibility) override; virtual void refresh() override; - S32 getCurrentParcelId() const { return mCurrentParcelId; } - void setCurrentParcelId(S32 parcel_id) { mCurrentParcelId = parcel_id; } + S32 getCurrentParcelId() const { return mCurrentParcelId; } + void setCurrentParcelId(S32 parcel_id) { mCurrentParcelId = parcel_id; } virtual bool isRegion() const = 0; virtual LLParcel * getParcel() = 0; @@ -95,9 +94,9 @@ protected: void setApplyProgress(bool started); void setDirtyFlag(U32 flag); void clearDirtyFlag(U32 flag); - bool getIsDirty() const { return (mDirtyFlag != 0); } - bool getIsDirtyFlag(U32 flag) const { return ((mDirtyFlag & flag) != 0); } - U32 getDirtyFlag() const { return mDirtyFlag; } + bool getIsDirty() const { return (mDirtyFlag != 0); } + bool getIsDirtyFlag(U32 flag) const { return ((mDirtyFlag & flag) != 0); } + U32 getDirtyFlag() const { return mDirtyFlag; } void onSwitchDefaultSelection(); void onSldDayLengthChanged(F32 value); @@ -130,8 +129,8 @@ protected: private: static void onIdlePlay(void *); - LLHandle<LLFloater> mSettingsFloater; - LLHandle<LLFloater> mEditFloater; - S32 mDirtyFlag; + LLHandle<LLFloater> mSettingsFloater; + LLHandle<LLFloater> mEditFloater; + S32 mDirtyFlag; }; #endif // LL_LLPANELEXPERIENCES_H |