summaryrefslogtreecommitdiff
path: root/indra/newview/llsurface.h
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-02-07 11:20:06 -0600
committerRunitaiLinden <davep@lindenlab.com>2024-02-07 11:20:06 -0600
commit78cc23f89ce01eff6531d4130bdb8016296043a6 (patch)
treebc89602fc63bb40b15f76ce91b7cb6d33d4511d8 /indra/newview/llsurface.h
parentb0c7dc653dc730f1f95aa95fc6df876dfe7b04a0 (diff)
parent7a5b0f5acf0b8aee3e73af0eb15d8c6930b98243 (diff)
Merge branch 'release/materials_featurette' into materials_featurette/mirrors
Diffstat (limited to 'indra/newview/llsurface.h')
-rw-r--r--indra/newview/llsurface.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llsurface.h b/indra/newview/llsurface.h
index 33a64ae7d5..b7b47d2a1c 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);
+
// . __.