diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:21:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-11 10:21:19 -0400 |
| commit | 30f4163b7b576d96533b61d9b31243960fb83f2e (patch) | |
| tree | bd5dc1450e08c674a4619d7f16a9a4816005f9c4 /indra/newview/llsurface.h | |
| parent | 3d1aac4f5c369e9d402c41f1c790d9015f7c7773 (diff) | |
| parent | f5e2708a0fc4e08d3d0a5dc393bbd4bac09e1c55 (diff) | |
Merge branch 'main' of github.com:secondlife/viewer into lua-bradfix
to pick up Featurettes promotion + Brad's GitHub Windows build workaround.
Diffstat (limited to 'indra/newview/llsurface.h')
| -rw-r--r-- | indra/newview/llsurface.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h index ca86e2334e..093b141271 100644 --- a/indra/newview/llsurface.h +++ b/indra/newview/llsurface.h @@ -112,7 +112,8 @@ public: LLSurfacePatch *resolvePatchGlobal(const LLVector3d &position_global) const; // Update methods (called during idle, normally) - BOOL idleUpdate(F32 max_update_time); + template<bool PBR> + bool idleUpdate(F32 max_update_time); BOOL containsPosition(const LLVector3 &position); @@ -224,6 +225,9 @@ private: static S32 sTextureSize; // Size of the surface texture }; +extern template bool LLSurface::idleUpdate</*PBR=*/false>(F32 max_update_time); +extern template bool LLSurface::idleUpdate</*PBR=*/true>(F32 max_update_time); + // . __. |