diff options
author | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-09-10 12:07:01 -0700 |
commit | 3609eabe5460023d1460664feb5de10d68457725 (patch) | |
tree | 533d03aadf36730eb59c2627cfd09e35593dd03c /indra/newview/llviewerregion.cpp | |
parent | 3191a5ddc9b3512b79a8505072d13583eb9012c6 (diff) | |
parent | e241670694959833feaa0e667222b337095eb683 (diff) |
Merge viewer-release 6.3.2
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r-- | indra/newview/llviewerregion.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 4b05ec6e2b..ef9dfdf0bf 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2897,7 +2897,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("EstateChangeInfo"); capabilityNames.append("EventQueueGet"); capabilityNames.append("ExtEnvironment"); - capabilityNames.append("FacebookConnect"); capabilityNames.append("FlickrConnect"); capabilityNames.append("TwitterConnect"); @@ -2974,7 +2973,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("UpdateScriptTask"); capabilityNames.append("UpdateSettingsAgentInventory"); capabilityNames.append("UpdateSettingsTaskInventory"); - capabilityNames.append("UploadBakedTexture"); + capabilityNames.append("UploadBakedTexture"); capabilityNames.append("UserInfo"); capabilityNames.append("ViewerAsset"); capabilityNames.append("ViewerMetrics"); |