diff options
author | Merov Linden <merov@lindenlab.com> | 2013-09-06 18:26:21 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-09-06 18:26:21 -0700 |
commit | bf22b7150d2884fb68982764cd6a122d9c23909a (patch) | |
tree | 49c08f6985b625d47bdc1a44639543663a134337 /indra | |
parent | fcdd0e578ca1ac7b025c5583df1c42bd286b07af (diff) |
ACME-905 : Get the FacebookConnect cap each time we need it (it's not that much)
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/llfacebookconnect.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index 9c70757278..611d18d6d6 100644 --- a/indra/newview/llfacebookconnect.cpp +++ b/indra/newview/llfacebookconnect.cpp @@ -356,9 +356,9 @@ void LLFacebookConnect::openFacebookWeb(std::string url) std::string LLFacebookConnect::getFacebookConnectURL(const std::string& route, bool include_read_from_master) { - static std::string sFacebookConnectUrl = gAgent.getRegion()->getCapability("FacebookConnect"); - - std::string url = sFacebookConnectUrl + route; + std::string url = gAgent.getRegion()->getCapability("FacebookConnect"); + url += route; + if (include_read_from_master && mReadFromMaster) { url += "?read_from_master=true"; |