diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-02 15:13:47 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-02 15:13:47 -0800 |
| commit | 5fe626afabd2857980e8011ceb6081f9e9f108c7 (patch) | |
| tree | 1d441e34455c6b17abe828fa15e4dba83c90a13f /indra/newview/llpanelenvironment.h | |
| parent | fb093ce412697a281756dcbbe5451d681f113aa7 (diff) | |
SL-10279: Most functionality now present. Still needs some cleanup on the bump code.
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index a0a60a2bf9..3649abe939 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -36,6 +36,7 @@ #include "llparcel.h" #include "llsettingspicker.h" #include "llfloatereditextdaycycle.h" +#include "llestateinfomodel.h" class LLViewerRegion; @@ -87,6 +88,7 @@ protected: static const std::string STR_NO_PARCEL; static const std::string STR_CROSS_REGION; static const std::string STR_LEGACY; + static const std::string STR_DISALLOWED; static const U32 DIRTY_FLAG_DAYCYCLE; static const U32 DIRTY_FLAG_DAYLENGTH; @@ -110,14 +112,10 @@ protected: void onAltSliderCallback(LLUICtrl *cntrl, const LLSD &data); void onAltSliderMouseUp(); - void onBtnApply(); - void onBtnReset(); void onBtnEdit(); void onBtnSelect(); void onBtnDefault(); - virtual void doApply(); - void udpateApparentTimeOfDay(); void onPickerCommitted(LLUUID item_id); @@ -162,12 +160,15 @@ protected: F32 mAltitude; }; typedef std::map<std::string, AltitudeData> altitudes_data_t; - altitudes_data_t mAltitudes; - S32 mCurEnvVersion; // used to filter duplicate callbacks/refreshes + altitudes_data_t mAltitudes; + S32 mCurEnvVersion; // used to filter duplicate callbacks/refreshes +protected: + void refreshFromEstate(); + bool mAllowOverride; private: - static void onIdlePlay(void *); + static void onIdlePlay(void *); typedef boost::signals2::connection connection_t; @@ -181,6 +182,7 @@ private: bool mCrossRegion; bool mNoSelection; bool mNoEnvironment; + }; class LLSettingsDropTarget : public LLView |