diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2022-04-29 17:26:17 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2022-04-29 17:26:17 -0600 |
| commit | 82311e4b44a863078fb1f47d56e9543abaae210c (patch) | |
| tree | 9da37968aca957045a4750ab1915ba85b172f427 /indra/newview/pipeline.h | |
| parent | f05e58715e0a18a7ba2ace87c2ae45684c864169 (diff) | |
| parent | 93a025966649e281ceff8d1471bc983cc036bc17 (diff) | |
Merge branch 'DRTVWR-559' into euclid-17277
Diffstat (limited to 'indra/newview/pipeline.h')
| -rw-r--r-- | indra/newview/pipeline.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index 62d3ae7a39..150d3c7d58 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -38,6 +38,7 @@ #include "llgl.h" #include "lldrawable.h" #include "llrendertarget.h" +#include "llenvironmentmap.h" #include <stack> @@ -426,6 +427,9 @@ public: void hideObject( const LLUUID& id ); void restoreHiddenObject( const LLUUID& id ); + LLEnvironmentMap mEnvironmentMap; + void overrideEnvironmentMap(); + private: void unloadShaders(); void addToQuickLookup( LLDrawPool* new_poolp ); |