summaryrefslogtreecommitdiff
path: root/indra/newview/llvovolume.h
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-10-21 14:54:43 -0700
committerRick Pasetto <rick@lindenlab.com>2009-10-21 14:54:43 -0700
commit7034a4ef9b4d6d35eeffe439dd32c770fa1ba9e4 (patch)
treeefd02b9b220b17063c80f57aaec490ed497cea9a /indra/newview/llvovolume.h
parent54517fc696a2bd18018880f0f0a2b4cd2544afbe (diff)
DEV-41600: one last change: rename INTERACT and CONTROl to MEDIA_PERM_INTERACT and MEDIA_PERM_CONTROL
Diffstat (limited to 'indra/newview/llvovolume.h')
-rw-r--r--indra/newview/llvovolume.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index e4a6ec4b32..00810b22c4 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -245,7 +245,7 @@ public:
// 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);