diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-06-11 12:33:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-11 12:33:53 -0400 |
| commit | e92689063bdbe34907348a12f1db39bc81132783 (patch) | |
| tree | 3d7b76e4f82fbb147e6c07f104fb85c55246fd99 /indra/newview/llsurface.h | |
| parent | f3bfc13f7957a5f142871bddc57d63cd08595ad9 (diff) | |
| parent | b5546377b0aa2482756b1dad4258659edc630c3b (diff) | |
Merge pull request #1697 from secondlife/lua-bradfix
Merge promoted Featurettes + 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); + // . __. |