summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.h
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-07-07 03:17:35 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-07-07 03:17:35 +0300
commit99691e6a139a1b0f8d52c030d8dd4494a92e071a (patch)
tree534e73bf0b1fa9496140c795182aa326c48c503c /indra/newview/llfloaterregioninfo.h
parent66dcc72870b19c6ada65a643ca33c779c9c9989b (diff)
STORM-1481 FIXED Fixed jerky transition when switching region from fixed sky to a day cycle.
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
-rw-r--r--indra/newview/llfloaterregioninfo.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 4809937324..e7917c382c 100644
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -34,6 +34,8 @@
#include "llhost.h"
#include "llpanel.h"
+#include "llenvmanager.h" // for LLEnvironmentSettings
+
class LLAvatarName;
class LLDispatcher;
class LLLineEditor;
@@ -431,7 +433,7 @@ private:
void setApplyProgress(bool started);
void setDirty(bool dirty);
- void sendRegionSunUpdate(F32 sun_angle);
+ void sendRegionSunUpdate();
void populateWaterPresetsList();
void populateSkyPresetsList();
@@ -454,6 +456,9 @@ private:
void onRegionSettingschange();
void onRegionSettingsApplied(bool ok);
+ /// New environment settings that are being applied to the region.
+ LLEnvironmentSettings mNewRegionSettings;
+
bool mEnableEditing;
LLRadioGroup* mRegionSettingsRadioGroup;