diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-11-12 17:28:59 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-11-12 17:28:59 +0000 |
| commit | 1143edc42e04981cc9754227ea2a3999da6b770f (patch) | |
| tree | d03d440af9be43f97fd28071204dfe19a50dddc6 /indra/newview/llpanelenvironment.h | |
| parent | bdf4442e216273bb32eeb607857efdad2336ee81 (diff) | |
| parent | 77b278b7f5615a6ba93b47c2a0d8a2338dc27dc2 (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #187)
SL-9620 Viewer crashes after clicking "Commit" button while editing Day Cycle preset
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llpanelenvironment.h')
| -rw-r--r-- | indra/newview/llpanelenvironment.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelenvironment.h b/indra/newview/llpanelenvironment.h index 2c070eb21f..bca7743145 100644 --- a/indra/newview/llpanelenvironment.h +++ b/indra/newview/llpanelenvironment.h @@ -160,7 +160,7 @@ protected: }; typedef std::map<std::string, AltitudeData> altitudes_data_t; altitudes_data_t mAltitudes; - + S32 mCurEnvVersion; private: |