From 7847c8941f8c78ab7cdef65aadf4dfccf645bbf3 Mon Sep 17 00:00:00 2001
From: callum <none@none>
Date: Thu, 9 Jun 2011 13:48:35 -0700
Subject: EXP-676 FIX As a web developer, I want to access information about
 the current state of the SL client, such as avatar location

---
 indra/llplugin/llpluginclassmedia.cpp | 18 +++---------------
 indra/llplugin/llpluginclassmedia.h   |  3 +--
 2 files changed, 4 insertions(+), 17 deletions(-)

(limited to 'indra/llplugin')

diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index 8f161201f4..d3d0403bbb 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -436,27 +436,15 @@ std::string LLPluginClassMedia::translateModifiers(MASK modifiers)
 	return result;
 }
 
-void LLPluginClassMedia::jsExposeObjectEvent( bool expose )
+void LLPluginClassMedia::jsEnableObject( bool enable )
 {
 	if( ! mPlugin || !mPlugin->isRunning() || mPlugin->isBlocked() )
 	{
 		return;
 	}
 
-	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "js_expose_object");
-	message.setValueBoolean( "expose", expose );
-	sendMessage( message );
-}
-
-void LLPluginClassMedia::jsValuesValidEvent( bool valid )
-{
-	if( ! mPlugin || !mPlugin->isRunning() || mPlugin->isBlocked() )
-	{
-		return;
-	}
-
-	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "js_values_valid");
-	message.setValueBoolean( "valid", valid );
+	LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "js_enable_object");
+	message.setValueBoolean( "enable", enable );
 	sendMessage( message );
 }
 
diff --git a/indra/llplugin/llpluginclassmedia.h b/indra/llplugin/llpluginclassmedia.h
index c061390699..f8ed89f644 100644
--- a/indra/llplugin/llpluginclassmedia.h
+++ b/indra/llplugin/llpluginclassmedia.h
@@ -119,8 +119,7 @@ public:
 	void scrollEvent(int x, int y, MASK modifiers);
 
 	// Javascript <-> viewer events
-	void jsExposeObjectEvent( bool expose );
-	void jsValuesValidEvent( bool valid );
+	void jsEnableObject( bool enable );
 	void jsAgentLocationEvent( double x, double y, double z );
 	void jsAgentGlobalLocationEvent( double x, double y, double z );
 	void jsAgentOrientationEvent( double angle );
-- 
cgit v1.2.3