diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-12 14:07:56 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-12 14:07:56 -0800 |
| commit | 9475a593a170f0c90a8d353de3e1277f844ee913 (patch) | |
| tree | 1d32cc3383b13fc51e2f6b7f03d50b7e0f63aa1b /indra/newview/llpanelenvironment.h | |
| parent | 70ac8d9fa7049891ed1b65f68f112127dfb5f5f7 (diff) | |
| parent | 1cc8286c2097fb0896d40df6fe8ef311fa4c92ef (diff) | |
Merge
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index bca7743145..05f25fa78f 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -142,7 +142,7 @@ protected: LLEnvironment::EnvironmentInfo::ptr_t mCurrentEnvironment; - void onEnvironmentChanged(LLEnvironment::EnvSelection_t env); + void onEnvironmentChanged(LLEnvironment::EnvSelection_t env, S32 version); class AltitudeData { @@ -160,7 +160,7 @@ protected: }; typedef std::map<std::string, AltitudeData> altitudes_data_t; altitudes_data_t mAltitudes; - S32 mCurEnvVersion; + S32 mCurEnvVersion; // used to filter duplicate callbacks/refreshes private: |