diff options
author | simon <none@none> | 2014-06-24 09:47:21 -0700 |
---|---|---|
committer | simon <none@none> | 2014-06-24 09:47:21 -0700 |
commit | 527f180dd74d83e478d68402626ca23341cc42e6 (patch) | |
tree | 5aef870c565ef6f919e1cff257093c9b191ef0a5 /indra/newview/llviewerregion.cpp | |
parent | 07e7fbb4ade2e05c4863ca1e40ce26304449697d (diff) | |
parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) |
Merge viewer-release and become version 3.7.11
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-x | indra/newview/llviewerregion.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 159ee58425..f09e2b3b90 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2687,7 +2687,8 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("EstateChangeInfo"); capabilityNames.append("EventQueueGet"); capabilityNames.append("FacebookConnect"); - //capabilityNames.append("FacebookRedirect"); + capabilityNames.append("FlickrConnect"); + capabilityNames.append("TwitterConnect"); if (gSavedSettings.getBOOL("UseHTTPInventory")) { |