DEV-41600 Refactored my previous change based on review feedback from monroe

1 files changed, 6 insertions, 2 deletions

diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index d8ae9a5453..e4a6ec4b32 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -242,8 +242,12 @@ public:
     // Bounce back media at the given index to its current URL (or home URL, if current URL is empty)
 	void mediaNavigateBounceBack(U8 texture_index);
     
-    // Returns whether or not this object has permission to navigate the given media entry
-    bool hasNavigatePermission(const LLMediaEntry* media_entry);
+    // Returns whether or not this object has permission to navigate or control 
+	// the given media entry
+	enum MediaPermType {
+		INTERACT, CONTROL
+	};
+    bool hasMediaPermission(const LLMediaEntry* media_entry, MediaPermType perm_type);
     
 	void mediaNavigated(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin, std::string new_location);
 	void mediaEvent(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin, LLViewerMediaObserver::EMediaEvent event);