diff options
author | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
---|---|---|
committer | dolphin <dolphin@lindenlab.com> | 2013-10-25 09:52:31 -0700 |
commit | 7bbb802385e58b1f9c2e7b04ad2f3f20c125be44 (patch) | |
tree | 88ccb7d4cc17bb9615ee61ef001f8cb8963252fb /indra/newview/llviewerregion.cpp | |
parent | a6faeac94530e59d2c2a56df63a1d78e00fb0247 (diff) | |
parent | ea1e1b0925b386cf83178539b8eae9e25c573548 (diff) |
Merge with 3.6.9
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rwxr-xr-x | indra/newview/llviewerregion.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 6959690ff1..bd6d852ef1 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1587,6 +1587,8 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("EnvironmentSettings"); capabilityNames.append("EstateChangeInfo"); capabilityNames.append("EventQueueGet"); + capabilityNames.append("FacebookConnect"); + //capabilityNames.append("FacebookRedirect"); if (gSavedSettings.getBOOL("UseHTTPInventory")) { |