diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-06-24 10:10:10 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-06-24 10:10:10 -0700 |
| commit | 74634fb9dae5280c5a020b25f027a6f910053feb (patch) | |
| tree | 71fe33062cad04819ba401048241f72812025a04 /indra/newview/llviewerregion.cpp | |
| parent | a9c281eb57206a0ff7083788e593a22b9f8ad01a (diff) | |
| parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) | |
Merge with 3.7.10-release
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 cffce5efc8..bcf6bc19ba 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2658,7 +2658,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")) { |