summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-09-25 16:14:13 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-09-25 16:52:43 +0300
commit427ed91cf9a7fb156df3fd4873881348a25db142 (patch)
tree03916a778411351d4d02ccabb167b984db35ee77 /indra/newview
parent108550e68e912168de0736c6fb656b79f0ec0cc2 (diff)
post-merge cleanup
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llmeshrepository.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llmeshrepository.h b/indra/newview/llmeshrepository.h
index 919d990ccb..81e49cb1d8 100644
--- a/indra/newview/llmeshrepository.h
+++ b/indra/newview/llmeshrepository.h
@@ -343,7 +343,6 @@ public:
bool skinInfoReceived(const LLUUID& mesh_id, U8* data, S32 data_size);
bool decompositionReceived(const LLUUID& mesh_id, U8* data, S32 data_size);
EMeshProcessingResult physicsShapeReceived(const LLUUID& mesh_id, U8* data, S32 data_size);
- LLSD& getMeshHeader(const LLUUID& mesh_id);
bool hasPhysicsShapeInHeader(const LLUUID& mesh_id);
void notifyLoadedMeshes();