diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:05:06 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-30 03:05:06 +0300 |
| commit | 58b4afa0ba83891482851b67965d1b1dd5b7de76 (patch) | |
| tree | 6b3d4e1ed0b6c13fb3acb838214a70b5a2ef3fa4 /indra/newview/llpaneleditsky.h | |
| parent | c8977fd904df10f225915ac5527d279440356257 (diff) | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
Merge branch 'master' into DRTVWR-530-maint
Diffstat (limited to 'indra/newview/llpaneleditsky.h')
| -rw-r--r-- | indra/newview/llpaneleditsky.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditsky.h b/indra/newview/llpaneleditsky.h index c02c9c95a0..801fb8b9b2 100644 --- a/indra/newview/llpaneleditsky.h +++ b/indra/newview/llpaneleditsky.h @@ -29,7 +29,7 @@ #include "llpanel.h" #include "llsettingssky.h" -#include "llfloaterfixedenvironment.h" +#include "llfloatereditenvironmentbase.h" //========================================================================= class LLSlider; |