From 2af050f5c67ef420a0d4dd3b7795abde432a7be7 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Sun, 18 Apr 2021 00:26:29 -0400
Subject: [PATCH] Fix error from missing support for std::optional in macos
10.13 target
---
indra/newview/llvovolume.cpp | 2 +-
indra/newview/llvovolume.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 49f1849cb31..ed0c1d84f7e 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -3628,7 +3628,7 @@ const LLMeshSkinInfo* LLVOVolume::getSkinInfo() const
return nullptr;
}
-std::optional<std::pair<LLMatrix4a*, F32*>> LLVOVolume::getCachedSkinRenderMatrix(U32& joint_count, LLVOAvatar *avatar, const LLMeshSkinInfo* skin)
+absl::optional<std::pair<LLMatrix4a*, F32*>> LLVOVolume::getCachedSkinRenderMatrix(U32& joint_count, LLVOAvatar *avatar, const LLMeshSkinInfo* skin)
{
// Calculate this only once per frame
const U32 curFrameCount = LLFrameTimer::getFrameCount();
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index 8296e2f74a8..ee2bba1d155 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -37,6 +37,7 @@
#include <map>
#include <set>
+#include "absl/types/optional.h"
class LLViewerTextureAnim;
class LLDrawPool;
@@ -300,7 +301,7 @@ class LLVOVolume final : public LLViewerObject
BOOL setIsFlexible(BOOL is_flexible);
const LLMeshSkinInfo* getSkinInfo() const;
- std::optional<std::pair<LLMatrix4a*, F32*>> getCachedSkinRenderMatrix(U32& joint_count, LLVOAvatar* avatar, const LLMeshSkinInfo* skin = nullptr);
+ absl::optional<std::pair<LLMatrix4a*, F32*>> getCachedSkinRenderMatrix(U32& joint_count, LLVOAvatar* avatar, const LLMeshSkinInfo* skin = nullptr);
// Extended Mesh Properties
U32 getExtendedMeshFlags() const;
--
GitLab