summaryrefslogtreecommitdiff
path: root/indra/newview/llenvironment.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-08-20 14:59:02 -0700
committerRider Linden <rider@lindenlab.com>2018-08-20 14:59:02 -0700
commit8fc3956a5eeaa2dffabdcda60800d9c4d4e49c43 (patch)
treeb7c884d7283eb25c43505131f97d899c43efae29 /indra/newview/llenvironment.h
parent1e3ee272ae811b862a529b6f3bbebb50a0c22580 (diff)
Use the EnvironmentInfo structure to pass information back from legacy environment requests.
Diffstat (limited to 'indra/newview/llenvironment.h')
-rw-r--r--indra/newview/llenvironment.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llenvironment.h b/indra/newview/llenvironment.h
index eadbb3e941..b5bd353066 100644
--- a/indra/newview/llenvironment.h
+++ b/indra/newview/llenvironment.h
@@ -83,8 +83,10 @@ public:
std::array<F32, 4> mAltitudes;
bool mIsDefault;
LLUUID mAssetId;
+ bool mIsLegacy;
static ptr_t extract(LLSD);
+ static ptr_t extractLegacy(LLSD);
};
enum EnvSelection_t
@@ -229,8 +231,6 @@ public:
//-------------------------------------------
connection_t setEnvironmentChanged(environment_changed_fn cb);
- void onLegacyRegionSettings(LLSD data);
-
void requestRegion(environment_apply_fn cb = environment_apply_fn());
void updateRegion(const LLUUID &asset_id, S32 day_length, S32 day_offset, environment_apply_fn cb = environment_apply_fn());
void updateRegion(const LLSettingsDay::ptr_t &pday, S32 day_length, S32 day_offset, environment_apply_fn cb = environment_apply_fn());