diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-03 16:02:48 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-03 16:02:48 -0400 |
| commit | 276f95e67ee10cbadee899c845c385cadcaa8292 (patch) | |
| tree | 01cb39fcdfaadb62d665b63b8bd35b1f4487c208 /indra/newview/llgltfmateriallist.h | |
| parent | d2ed30f82367ae875d2b894e55118867e40239e9 (diff) | |
| parent | 9567393f803dfb0c786b8e917e41c8f4b8b22af7 (diff) | |
Merge branch 'main' into release/luau-scripting.
Diffstat (limited to 'indra/newview/llgltfmateriallist.h')
| -rw-r--r-- | indra/newview/llgltfmateriallist.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llgltfmateriallist.h b/indra/newview/llgltfmateriallist.h index 7317214019..f1c4ce20f9 100644 --- a/indra/newview/llgltfmateriallist.h +++ b/indra/newview/llgltfmateriallist.h @@ -52,8 +52,6 @@ public: void flushMaterials(); - static void registerCallbacks(); - // Queue an modification of a material that we want to send to the simulator. Call "flushUpdates" to flush pending updates. // id - ID of object to modify // side - TexureEntry index to modify, or -1 for all sides @@ -99,8 +97,6 @@ public: // any override data that arrived before the object was ready to receive it void applyQueuedOverrides(LLViewerObject* obj); - static void loadCacheOverrides(const LLGLTFOverrideCacheEntry& override); - // Apply an override update with the given data void applyOverrideMessage(LLMessageSystem* msg, const std::string& data); |