From 7034a4ef9b4d6d35eeffe439dd32c770fa1ba9e4 Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Wed, 21 Oct 2009 14:54:43 -0700
Subject: [PATCH] DEV-41600: one last change: rename INTERACT and CONTROl to
MEDIA_PERM_INTERACT and MEDIA_PERM_CONTROL
---
indra/newview/llvovolume.cpp | 4 ++--
indra/newview/llvovolume.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4a7bb6a1082..d896e1f7db2 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1810,7 +1810,7 @@ bool LLVOVolume::hasMediaPermission(const LLMediaEntry* media_entry, MediaPermTy
return true;
}
- U8 media_perms = (perm_type == INTERACT) ? media_entry->getPermsInteract() : media_entry->getPermsControl();
+ U8 media_perms = (perm_type == MEDIA_PERM_INTERACT) ? media_entry->getPermsInteract() : media_entry->getPermsControl();
// World permissions
if (0 != (media_perms & LLMediaEntry::PERM_ANYONE))
@@ -1855,7 +1855,7 @@ void LLVOVolume::mediaNavigated(LLViewerMediaImpl *impl, LLPluginClassMedia* plu
{
block_navigation = true;
}
- if (!block_navigation && !hasMediaPermission(mep, INTERACT))
+ if (!block_navigation && !hasMediaPermission(mep, MEDIA_PERM_INTERACT))
{
block_navigation = true;
}
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index e4a6ec4b320..00810b22c4d 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -245,7 +245,7 @@ class LLVOVolume : public LLViewerObject
// Returns whether or not this object has permission to navigate or control
// the given media entry
enum MediaPermType {
- INTERACT, CONTROL
+ MEDIA_PERM_INTERACT, MEDIA_PERM_CONTROL
};
bool hasMediaPermission(const LLMediaEntry* media_entry, MediaPermType perm_type);
--
GitLab