diff options
| author | Cosmic Linden <cosmic@lindenlab.com> | 2024-04-12 11:27:24 -0700 |
|---|---|---|
| committer | Cosmic Linden <cosmic@lindenlab.com> | 2024-04-25 16:48:07 -0700 |
| commit | aac18ada713aa34cafe477264ab08d5f1ba4e205 (patch) | |
| tree | 97128896389c46d7741e319bb43615198a32a231 /indra/newview/llvlcomposition.h | |
| parent | 47255bf44d04e5ba7b33d44f8cc738da4be9d53a (diff) | |
secondlife/viewer#1184: Use more robust/memory-friendly setLoadedCallback for minimap gen. Fix some emissive maps.
Diffstat (limited to 'indra/newview/llvlcomposition.h')
| -rw-r--r-- | indra/newview/llvlcomposition.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvlcomposition.h b/indra/newview/llvlcomposition.h index 6a460e3285..5db832e034 100644 --- a/indra/newview/llvlcomposition.h +++ b/indra/newview/llvlcomposition.h @@ -130,8 +130,13 @@ protected: BOOL mParamsReady = FALSE; LLSurface *mSurfacep; + // Final minimap raw images LLPointer<LLImageRaw> mRawImages[LLTerrainMaterials::ASSET_COUNT]; + // Only non-null during minimap tile generation + LLPointer<LLImageRaw> mRawImagesBaseColor[LLTerrainMaterials::ASSET_COUNT]; + LLPointer<LLImageRaw> mRawImagesEmissive[LLTerrainMaterials::ASSET_COUNT]; + F32 mStartHeight[CORNER_COUNT]; F32 mHeightRange[CORNER_COUNT]; |