From 03be587563e3fbb4e5ecc85203d0afc593a3cb42 Mon Sep 17 00:00:00 2001
From: JessicaLyon <jessica@trinityenterprises.ca>
Date: Thu, 10 Feb 2011 12:48:21 -0500
Subject: [PATCH] added infrastructure for log browse buttons under prefs>
 network. More to do..

---
 indra/newview/llfloaterpreference.cpp            | 16 +++++++++++++++-
 indra/newview/llfloaterpreference.h              |  3 +++
 .../default/xui/en/panel_preferences_privacy.xml |  2 +-
 .../default/xui/en/panel_preferences_setup.xml   | 14 +++++++-------
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index 137c4a92e7..87a980cd76 100644
--- a/indra/newview/llfloaterpreference.cpp
+++ b/indra/newview/llfloaterpreference.cpp
@@ -307,6 +307,9 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
 //	mCommitCallbackRegistrar.add("Pref.ClearCache",				boost::bind(&LLFloaterPreference::onClickClearCache, this));
 	mCommitCallbackRegistrar.add("Pref.WebClearCache",			boost::bind(&LLFloaterPreference::onClickBrowserClearCache, this));
 	mCommitCallbackRegistrar.add("Pref.SetCache",				boost::bind(&LLFloaterPreference::onClickSetCache, this));
+	mCommitCallbackRegistrar.add("Pref.BrowseCache",			boost::bind(&LLFloaterPreference::onClickBrowseCache, this));
+	mCommitCallbackRegistrar.add("Pref.BrowseCrashLogs",		boost::bind(&LLFloaterPreference::onClickBrowseCrashLogs, this));
+	mCommitCallbackRegistrar.add("Pref.BrowseSettingsDir",		boost::bind(&LLFloaterPreference::onClickBrowseSettingsDir, this));
 	mCommitCallbackRegistrar.add("Pref.ResetCache",				boost::bind(&LLFloaterPreference::onClickResetCache, this));
 	mCommitCallbackRegistrar.add("Pref.ClearCache",				boost::bind(&LLFloaterPreference::onClickClearCache, this));
 	//	mCommitCallbackRegistrar.add("Pref.ClickSkin",				boost::bind(&LLFloaterPreference::onClickSkin, this,_1, _2));
@@ -784,7 +787,18 @@ void LLFloaterPreference::onClickSetCache()
 		gSavedSettings.setString("CacheLocationTopFolder", top_folder);
 	}
 }
-
+void LLFloaterPreference::onClickBrowseCache()
+{
+	//todo: add window open (JL)
+}
+void LLFloaterPreference::onClickBrowseCrashLogs()
+{
+	//todo: add window open (JL)
+}
+void LLFloaterPreference::onClickBrowseSettingsDir()
+{
+	//todo: add window open (JL)
+}
 void LLFloaterPreference::onClickResetCache()
 {
 	if (!gSavedSettings.getString("CacheLocation").empty())
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index 5b5b59c58f..5488ab6909 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -116,8 +116,11 @@ public:
 	void setCacheLocation(const LLStringExplicit& location);
 
 	void onClickSetCache();
+	void onClickBrowseCache();
+	void onClickBrowseCrashLogs();
 	void onClickResetCache();
 	void onClickClearCache();
+	void onClickBrowseSettingsDir();
 	void onClickSkin(LLUICtrl* ctrl,const LLSD& userdata);
 	void onSelectSkin();
 	void onClickSetKey();
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
index f86be6f409..d9c19e9a2c 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -150,7 +150,7 @@
      top_pad="5"
      width="250"/>
     <button
-	 enabled="false"
+	 enabled="true"
      follows="right|bottom"
      height="23"
      label="Browse"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
index 873a3ae771..6adbeeb71a 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml
@@ -171,7 +171,7 @@
    top_delta="-1"
    width="45">
     <button.commit_callback
-     function="Pref.OpenCache" />
+     function="Pref.BrowseCache" />
   </button>
   <button
    follows="left|top"
@@ -245,11 +245,11 @@
    label_selected="Browse"
    layout="topleft"
    left_pad="5"
-   name="open_logpath"
+   name="log_path_button"
    top_delta="-1"
    width="45">
     <button.commit_callback
-     function="Pref.OpenLogPath" />
+     function="Pref.LogPath" />
   </button>
   <button
   enabled="false"
@@ -287,11 +287,11 @@
     label_selected="Browse Crash Logs"
     layout="topleft"
     left="20"
-    name="open_crashlogs"
+    name="browse_crashlogs"
     top_delta="30"
     width="120">
     <button.commit_callback
-     function="Pref.OpenCrashLogs" />
+     function="Pref.BrowseCrashLogs" />
   </button>
   <button
   enabled="false"
@@ -301,11 +301,11 @@
     label_selected="Browse Settings folder"
     layout="topleft"
     left_pad="10"
-    name="open_settingsdir"
+    name="browse_settingsdir"
     top_delta="0"
     width="140">
     <button.commit_callback
-     function="Pref.OpenSettingsDir" />
+     function="Pref.BrowseSettingsDir" />
   </button>
   <text
          type="string"