From ebbb468a795d503a8869467d642d5f4962a3d7bf Mon Sep 17 00:00:00 2001
From: Rick Pasetto <rick@lindenlab.com>
Date: Mon, 9 Nov 2009 16:56:33 -0800
Subject: FIX DEV-42093 - Make sure to navigate home if current URL is empty on
 "Apply"

This change gets rid of the crufty (and confusing) "apply()"
functions from llpanelmediasettings*.  Those functions were
never being called, yet changes were being made in them.

Instead, I added "preApply()" and "postApply()" to each of
these panels, which the floater (who really does the "apply()"ing)
now calls before and after it applies the changes to the
media data.
---
 indra/newview/llpanelmediasettingspermissions.h | 46 ++++++++++++++-----------
 1 file changed, 26 insertions(+), 20 deletions(-)

(limited to 'indra/newview/llpanelmediasettingspermissions.h')

diff --git a/indra/newview/llpanelmediasettingspermissions.h b/indra/newview/llpanelmediasettingspermissions.h
index ecc50e3582..45a596c615 100644
--- a/indra/newview/llpanelmediasettingspermissions.h
+++ b/indra/newview/llpanelmediasettingspermissions.h
@@ -46,26 +46,32 @@ class LLNameBox;
 
 class LLPanelMediaSettingsPermissions : public LLPanel
 {
-	public:
-		BOOL postBuild();
-		virtual void draw();
-		static void apply(void*);
-        void getValues(LLSD &fill_me_in);
-
-		LLPanelMediaSettingsPermissions();
-		~LLPanelMediaSettingsPermissions();
-
-		static void initValues( void* userdata, const LLSD& media_settings, bool editable );
-		static void clearValues( void* userdata,  bool editable);
-
-	private:
-        LLCheckBoxCtrl* mPermsOwnerInteract;
-		LLCheckBoxCtrl* mPermsOwnerControl;
-		LLNameBox* mPermsGroupName;
-		LLCheckBoxCtrl* mPermsGroupInteract;
-		LLCheckBoxCtrl* mPermsGroupControl;
-		LLCheckBoxCtrl* mPermsWorldInteract;
-		LLCheckBoxCtrl* mPermsWorldControl;
+public:
+	LLPanelMediaSettingsPermissions();
+	~LLPanelMediaSettingsPermissions();
+	
+	BOOL postBuild();
+	virtual void draw();
+	
+	// XXX TODO: put these into a common parent class?
+	// Hook that the floater calls before applying changes from the panel
+	void preApply();
+	// Function that asks the panel to fill in values associated with the panel
+    void getValues(LLSD &fill_me_in);
+	// Hook that the floater calls after applying changes to the panel
+	void postApply();
+	
+	static void initValues( void* userdata, const LLSD& media_settings, bool editable );
+	static void clearValues( void* userdata,  bool editable);
+	
+private:
+	LLCheckBoxCtrl* mPermsOwnerInteract;
+	LLCheckBoxCtrl* mPermsOwnerControl;
+	LLNameBox* mPermsGroupName;
+	LLCheckBoxCtrl* mPermsGroupInteract;
+	LLCheckBoxCtrl* mPermsGroupControl;
+	LLCheckBoxCtrl* mPermsWorldInteract;
+	LLCheckBoxCtrl* mPermsWorldControl;
 };
 
 #endif  // LL_LLPANELMEDIAMEDIASETTINGSPERMISSIONS_H
-- 
cgit v1.2.3