diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-08-01 20:56:09 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-08-01 20:56:09 -0700 |
| commit | 571ce028fdeeb21637cf3488344dfb536bc94164 (patch) | |
| tree | 92acd79224cb4e897da42ccc3670c4915fe4ec34 /indra/newview/llfacebookconnect.cpp | |
| parent | 7bcda3a511f47a465cb8e22eb3c36e1e82d19f17 (diff) | |
| parent | 1f6d19436e659954d766d6d3698d0bfabde4fa81 (diff) | |
Pull merge from lindenlab/viewer-fbc
Diffstat (limited to 'indra/newview/llfacebookconnect.cpp')
| -rw-r--r-- | indra/newview/llfacebookconnect.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index 0179b3f6b1..26fc480658 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -32,6 +32,7 @@ #include "llagent.h" #include "llcallingcard.h" // for LLAvatarTracker #include "llcommandhandler.h" +#include "llcontrol.h" #include "llhttpclient.h" #include "llnotificationsutil.h" #include "llurlaction.h" @@ -47,6 +48,8 @@ boost::scoped_ptr<LLEventPump> LLFacebookConnect::sStateWatcher(new LLEventStrea boost::scoped_ptr<LLEventPump> LLFacebookConnect::sInfoWatcher(new LLEventStream("FacebookConnectInfo")); boost::scoped_ptr<LLEventPump> LLFacebookConnect::sContentWatcher(new LLEventStream("FacebookConnectContent")); +extern LLControlGroup gSavedSettings; + // Local functions void log_facebook_connect_error(const std::string& request, U32 status, const std::string& reason, const std::string& code, const std::string& description) { @@ -336,8 +339,10 @@ void LLFacebookConnect::openFacebookWeb(std::string url) std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route) { + //TODO GIL : Remove this code along with extern and llcontrol.h header + std::string host = gSavedSettings.getString("SLShareHost"); //static std::string sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect"); - static std::string sFacebookConnectUrl = "http://int.fbc.aditi.lindenlab.com/fbc/agent/" + gAgentID.asString(); // TEMPORARY HACK FOR FB DEMO - Cho + static std::string sFacebookConnectUrl = host + "/fbc/agent/" + gAgentID.asString(); // TEMPORARY HACK FOR FB DEMO - Cho std::string url = sFacebookConnectUrl + route; llinfos << url << llendl; |