diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2016-05-10 14:59:33 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2016-05-10 14:59:33 -0700 |
commit | df55966b112142e194f07386a3673f395ec792fc (patch) | |
tree | 481234ace0fa5a95c0f135b7aa35872a8fa1946d /indra/newview/llfloaterregioninfo.h | |
parent | a670914c6d43dcde0677680375f53f8a67a89cf6 (diff) | |
parent | 94559950a2c670990db56bd74e65d26652421b8c (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
-rwxr-xr-x | indra/newview/llfloaterregioninfo.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 3c74618fff..46f2b42137 100755 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -113,6 +113,7 @@ private: protected: void onTabSelected(const LLSD& param); + void disableTabCtrls(); void refreshFromRegion(LLViewerRegion* region); // member data @@ -240,6 +241,7 @@ public: void setEnvControls(bool available); // Whether environment settings are available for this region BOOL validateTextureSizes(); + BOOL validateTextureHeights(); //static void onChangeAnything(LLUICtrl* ctrl, void* userData); // callback for any change, to enable commit button @@ -249,6 +251,11 @@ public: static void onClickUploadRaw(void*); static void onClickBakeTerrain(void*); bool callbackBakeTerrain(const LLSD& notification, const LLSD& response); + bool callbackTextureHeights(const LLSD& notification, const LLSD& response); + +private: + bool mConfirmedTextureHeights; + bool mAskedTextureHeights; }; ///////////////////////////////////////////////////////////////////////////// |