summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2013-05-13 18:29:28 -0700
committerMerov Linden <merov@lindenlab.com>2013-05-13 18:29:28 -0700
commitdbef09a2bb629cf6001a3963f6899bcac53b7774 (patch)
tree3168f4c06519c89df418f02e908f5d8df6bada39 /indra/newview/llviewermenu.cpp
parentcc87c6785258cb04f11cb79ce2e9899d33f11e03 (diff)
ACME-344 : Menu hooked up. Readded the missing completedHeader() methods in responder that I mistakenly took out during the refactor.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r--indra/newview/llviewermenu.cpp19
1 files changed, 19 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index beca08203f..bb9ad8c606 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -52,6 +52,7 @@
#include "lldaycyclemanager.h"
#include "lldebugview.h"
#include "llenvmanager.h"
+#include "llfacebookconnect.h"
#include "llfilepicker.h"
#include "llfirstuse.h"
#include "llfloaterbuy.h"
@@ -5970,6 +5971,21 @@ void handle_report_abuse()
LLFloaterReporter::showFromMenu(COMPLAINT_REPORT);
}
+void handle_facebook_connect()
+{
+ if (LLFacebookConnect::instance().getConnected())
+ {
+ LLFacebookConnect::instance().disconnectFromFacebook();
+ }
+ else
+ {
+ LLFacebookConnect::instance().getConnectionToFacebook();
+ }
+}
+
+//bool is_facebook_connected();
+
+
void handle_buy_currency()
{
LLBuyCurrencyHTML::openCurrencyFloater();
@@ -8719,4 +8735,7 @@ void initialize_menus()
view_listener_t::addMenu(new LLEditableSelected(), "EditableSelected");
view_listener_t::addMenu(new LLEditableSelectedMono(), "EditableSelectedMono");
view_listener_t::addMenu(new LLToggleUIHints(), "ToggleUIHints");
+
+ // Facebook Connect
+ commit.add("Facebook.Connect", boost::bind(&handle_facebook_connect));
}