diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-06-12 08:51:45 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-06-12 08:51:45 -0400 |
| commit | 77ac5e44a6b57e2b33dc3026c7a3bf2aa73d2df3 (patch) | |
| tree | 7cba2dcd5d4968519bba931388c5b80adbcc3e41 /indra/newview/llsurface.h | |
| parent | f95dc89d5e7481f4e02953617ce7a13feb87d27a (diff) | |
| parent | e92689063bdbe34907348a12f1db39bc81132783 (diff) | |
Merge 'release/luau-scripting' of secondlife/viewer into lua-login
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); + // . __. |