From 3016bb52520c1035dd421a63ddf6dbf4f2f92056 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Mon, 12 Jul 2021 16:16:01 +0200 Subject: [PATCH] The one where Linux does not let you have nice things and call them None... --- 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 912a8092f5..c6661cd400 100644 --- a/indra/newview/rlvactions.cpp +++ b/indra/newview/rlvactions.cpp @@ -443,7 +443,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 36b59c2a1b..989e506e0e 100644 --- a/indra/newview/rlvactions.h +++ b/indra/newview/rlvactions.h @@ -33,7 +33,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 {