From 7d4a52f6e75c24996ed82a438924f821f6df8efa Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 12 Jul 2021 04:34:50 -0400
Subject: [PATCH] Fix rlva merge error
---
indra/newview/rlvdefines.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index a0985de0b17..7aaec95a6d6 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -435,8 +435,8 @@ namespace RlvStringKeys
inline constexpr std::string_view RecvIm = "blocked_recvim"sv;
inline constexpr std::string_view RecvImRemote = "blocked_recvim_remote"sv;
inline constexpr std::string_view SendIm = "blocked_sendim"sv;
- inline constexpr std::string_view Share = make_string_view("blocked_share");
- inline constexpr std::string_view ShareGeneric = make_string_view("blocked_share_generic");
+ inline constexpr std::string_view Share = "blocked_share";
+ inline constexpr std::string_view ShareGeneric = "blocked_share_generic";
inline constexpr std::string_view StartConference = "blocked_startconf"sv;
inline constexpr std::string_view StartIm = "blocked_startim"sv;
inline constexpr std::string_view Teleport = "blocked_teleport"sv;
--
GitLab