From 5be9e96f4263b745fe50e3ef2c4f6de8a98d5922 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Wed, 14 Jul 2021 23:51:00 -0400
Subject: [PATCH] Fix gcc error
---
indra/newview/rlvactions.cpp | 2 +-
indra/newview/rlvactions.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp
index 43ba16276cb..a626f89fe83 100644
--- a/indra/newview/rlvactions.cpp
+++ b/indra/newview/rlvactions.cpp
@@ -446,7 +446,7 @@ bool RlvActions::canEdit(ERlvCheckType eCheckType)
(!rlvHandler.hasBehaviour(RLV_BHVR_EDIT) || rlvHandler.hasException(RLV_BHVR_EDIT)) &&
(!rlvHandler.hasBehaviour(RLV_BHVR_EDITATTACH) || rlvHandler.hasBehaviour(RLV_BHVR_EDITWORLD));
- case ERlvCheckType::None:
+ case ERlvCheckType::Nothing:
// Either @edit restricted with no exceptions or @editattach and @editworld restricted at the same time
return
(rlvHandler.hasBehaviour(RLV_BHVR_EDIT) && !rlvHandler.hasException(RLV_BHVR_EDIT)) ||
diff --git a/indra/newview/rlvactions.h b/indra/newview/rlvactions.h
index ea341f784e8..be5f95ca1c5 100644
--- a/indra/newview/rlvactions.h
+++ b/indra/newview/rlvactions.h
@@ -35,7 +35,7 @@ class LLVOAvatar;
// RlvActions class declaration - developer-friendly non-RLVa code facing class, use in lieu of RlvHandler whenever possible
//
-enum class ERlvCheckType { All, Some, None };
+enum class ERlvCheckType { All, Some, Nothing };
class RlvActions
{
--
GitLab