diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-01 00:22:15 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-08-01 00:22:15 +0300 |
| commit | 344d02af4fd568e5a55e1ed0a1a935fb4718d364 (patch) | |
| tree | 2820cecd06b0f800e59ffc4c79dbee67a47676ab /indra | |
| parent | 53f5d93eda0e2ec2bfb8efcd9fa372774db5e0c1 (diff) | |
| parent | 9248ca8115d1357b0df0234cc7075691e856b219 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 4f0460da29..b2587e7e5e 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2817,7 +2817,7 @@ void LLViewerRegion::unpackRegionHandshake() void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { capabilityNames.append("AbuseCategories"); - capabilityNames.append("AcceptFriendship"); + //capabilityNames.append("AcceptFriendship"); capabilityNames.append("AcceptGroupInvite"); // ReadOfflineMsgs recieved messages only!!! capabilityNames.append("AgentPreferences"); capabilityNames.append("AgentState"); @@ -2828,7 +2828,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("ChatSessionRequest"); capabilityNames.append("CopyInventoryFromNotecard"); capabilityNames.append("CreateInventoryCategory"); - capabilityNames.append("DeclineFriendship"); + //capabilityNames.append("DeclineFriendship"); capabilityNames.append("DeclineGroupInvite"); // ReadOfflineMsgs recieved messages only!!! capabilityNames.append("DispatchRegionInfo"); capabilityNames.append("DirectDelivery"); |