diff options
| author | Chris Baker <baker@lindenlab.com> | 2014-06-23 22:36:47 +0000 |
|---|---|---|
| committer | Chris Baker <baker@lindenlab.com> | 2014-06-23 22:36:47 +0000 |
| commit | b534562acf4a124ff46d2988e9aded5212ca458a (patch) | |
| tree | 0f83f834e7e8253669a8772460f35ddde2cff419 /indra/newview/llviewerregion.cpp | |
| parent | 845b80a3864093ebed940551d91441e45e4b50b9 (diff) | |
| parent | c7057ef56efc1cca5683ca22e2ad410198d131e8 (diff) | |
viewer-release merge
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 f15ebda452..d1e8ac9d7e 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")) { |