summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.h
diff options
context:
space:
mode:
authorCosmic Linden <cosmic@lindenlab.com>2024-02-29 16:52:35 -0800
committerCosmic Linden <cosmic@lindenlab.com>2024-02-29 16:52:35 -0800
commit0cb9e7f7e5bd02ded8b9f2bd9cd6c57a70187dcc (patch)
tree71b0ba143fde5fef2a7611df5756999a317f115f /indra/newview/llfloaterregioninfo.h
parentd79498e25991e425510643ecd1303a5675c5fbf6 (diff)
secondlife/viewer#712: Remember previously set textures/materials when possible. Not persistent.
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
-rw-r--r--indra/newview/llfloaterregioninfo.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index abd8e21503..315c6aca0f 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -36,6 +36,7 @@
#include "llpanel.h"
#include "llextendedstatus.h"
#include "llpanelenvironment.h"
+#include "llvlcomposition.h"
#include "lleventcoro.h"
@@ -243,7 +244,7 @@ class LLPanelRegionTerrainInfo : public LLPanelRegionInfo
LOG_CLASS(LLPanelRegionTerrainInfo);
public:
- LLPanelRegionTerrainInfo() : LLPanelRegionInfo() {}
+ LLPanelRegionTerrainInfo();
~LLPanelRegionTerrainInfo() {}
BOOL postBuild() override;
@@ -274,6 +275,8 @@ private:
bool mConfirmedTextureHeights;
bool mAskedTextureHeights;
boost::signals2::connection mRegionChangedSlot;
+ LLUUID mLastSetTextures[LLTerrainMaterials::ASSET_COUNT];
+ LLUUID mLastSetMaterials[LLTerrainMaterials::ASSET_COUNT];
};
/////////////////////////////////////////////////////////////////////////////