From aec007f8bd21d2133130fc6157202101c2424a6c Mon Sep 17 00:00:00 2001
From: Gilbert Gonzales <gilbert@lindenlab.com>
Date: Thu, 14 Mar 2013 11:09:39 -0700
Subject: forgot to add new .xml file for the gear menu in the FBC Test panel.
 Also cleaned up the code I added.

---
 indra/newview/llpanelpeople.cpp                    | 29 ++++++++-------------
 indra/newview/llpanelpeople.h                      |  2 ++
 .../newview/skins/default/xui/en/menu_gear_fbc.xml | 30 ++++++++++++++++++++++
 3 files changed, 42 insertions(+), 19 deletions(-)
 create mode 100644 indra/newview/skins/default/xui/en/menu_gear_fbc.xml

(limited to 'indra')

diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index dfc48145dc..ab82273ccd 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -1652,10 +1652,8 @@ bool LLPanelPeople::isAccordionCollapsedByUser(const std::string& name)
 	return isAccordionCollapsedByUser(getChild<LLUICtrl>(name));
 }
 
-void LLPanelPeople::onLoginFbcButtonClicked()
+void LLPanelPeople::openFacebookWeb(LLFloaterWebContent::Params& p)
 {
-	LLFloaterWebContent::Params p;
-	p.url("https://cryptic-ridge-1632.herokuapp.com/");
 	LLFloater* browser = LLFloaterReg::showInstance("web_content", p);
 
 	if (browser)
@@ -1666,31 +1664,24 @@ void LLPanelPeople::onLoginFbcButtonClicked()
 	}
 }
 
+void LLPanelPeople::onLoginFbcButtonClicked()
+{
+	LLFloaterWebContent::Params p;
+	p.url("https://cryptic-ridge-1632.herokuapp.com/");
+	openFacebookWeb(p);
+}
+
 void LLPanelPeople::onFacebookAppRequestClicked()
 {
 	LLFloaterWebContent::Params p;
 	p.url("http://www.facebook.com/dialog/apprequests?app_id=565771023434202&message=Test&redirect_uri=https://cryptic-ridge-1632.herokuapp.com/");
-	LLFloater* browser = LLFloaterReg::showInstance("web_content", p);
-
-	if (browser)
-	{
-		// start checking the browser to see if the data is available yet
-		mFbcTestBrowserHandle = browser->getHandle();
-		mFbcTestListUpdater->setActive(true);
-	}
+	openFacebookWeb(p);
 }
 
 void LLPanelPeople::onFacebookAppSendClicked()
 {
 	LLFloaterWebContent::Params p;
 	p.url("https://www.facebook.com/dialog/send?app_id=565771023434202&name=Test&link=http://www.cnet.com&redirect_uri=https://cryptic-ridge-1632.herokuapp.com/");
-	LLFloater* browser = LLFloaterReg::showInstance("web_content", p);
-
-	if (browser)
-	{
-		// start checking the browser to see if the data is available yet
-		mFbcTestBrowserHandle = browser->getHandle();
-		mFbcTestListUpdater->setActive(true);
-	}
+	openFacebookWeb(p);
 }
 // EOF
diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index feb32d1f69..39cdbc9bd7 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -30,6 +30,7 @@
 #include <llpanel.h>
 
 #include "llcallingcard.h" // for avatar tracker
+#include "llfloaterwebcontent.h"
 #include "llvoiceclient.h"
 
 class LLAvatarList;
@@ -117,6 +118,7 @@ private:
 	void					onLoginFbcButtonClicked();
 	void					onFacebookAppRequestClicked();
 	void					onFacebookAppSendClicked();
+	void					openFacebookWeb(LLFloaterWebContent::Params& p);
 
 	//returns false only if group is "none"
 	bool					isRealGroup();
diff --git a/indra/newview/skins/default/xui/en/menu_gear_fbc.xml b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
new file mode 100644
index 0000000000..b05ba46107
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/menu_gear_fbc.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<toggleable_menu 
+     name="menu_group_plus"
+     left="0" bottom="0" visible="false"
+     mouse_opaque="false">
+  <menu_item_check
+   label="Facebook App Settings"
+   layout="topleft"
+   name="Facebook App Settings">
+      <menu_item_check.on_click
+       function="Advanced.WebContentTest"
+       parameter="http://www.facebook.com/settings?tab=applications" />
+  </menu_item_check>
+  <menu_item_check
+   label="Facebook App Request"
+   layout="topleft"
+   name="Facebook App Request">
+    <menu_item_check.on_click
+     function="People.requestFBC"
+     parameter="http://www.facebook.com/settings?tab=applications" />
+  </menu_item_check>
+  <menu_item_check
+   label="Facebook App Send"
+   layout="topleft"
+   name="Facebook App Send">
+    <menu_item_check.on_click
+     function="People.sendFBC"
+     parameter="http://www.facebook.com/settings?tab=applications" />
+  </menu_item_check>  
+</toggleable_menu>
\ No newline at end of file
-- 
cgit v1.2.3