diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-01 15:12:58 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-08-01 15:12:58 -0700 |
| commit | 1f6d19436e659954d766d6d3698d0bfabde4fa81 (patch) | |
| tree | dae2144b182f57e4329ad6e32648002ce1deb9e9 /indra | |
| parent | 12bbf0e92251818c397bc4e33a26395b3ad98175 (diff) | |
ACME: add SLShareHost variable to settings.xml, which allows changing the fb service host location as needed.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llfacebookconnect.cpp | 7 |
2 files changed, 17 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 672e323801..832610c72c 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3456,6 +3456,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>SLShareHost</key> + <map> + <key>Comment</key> + <string>Host for contacting SL FB services</string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>String</string> + <key>Value</key> + <string>http://int.fbc.aditi.lindenlab.com</string> + </map> <key>FastCacheFetchEnabled</key> <map> <key>Comment</key> diff --git a/indra/newview/llfacebookconnect.cpp b/indra/newview/llfacebookconnect.cpp index a7b7224d28..dbebe8d14a 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; |