summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-03-14 11:09:39 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-03-14 11:09:39 -0700
commitaec007f8bd21d2133130fc6157202101c2424a6c (patch)
tree7f4720ec58f13bb7d9f483fef9c91c37d484b506 /indra/newview/llpanelpeople.cpp
parent3a08b4e3889753e74b35a643b4753912cebe3c5a (diff)
forgot to add new .xml file for the gear menu in the FBC Test panel. Also cleaned up the code I added.
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r--indra/newview/llpanelpeople.cpp29
1 files changed, 10 insertions, 19 deletions
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