diff options
| author | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
|---|---|---|
| committer | Anchor Linden <anchor@lindenlab.com> | 2018-09-17 10:50:08 -0700 |
| commit | e5aeaa659a453674ef898cdd2ad6183d5eb77e41 (patch) | |
| tree | 2c7196f2f80d11b6f6d660c5852299646f2d449a /indra/newview/llviewerregion.cpp | |
| parent | 7318bd61f7a7ea89e471a6e0f3cc310786a3b41c (diff) | |
| parent | 6f54add8a8852c8f3df86abebe38ef0ce4a6742c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 98320247e0..836b92efb8 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1877,7 +1877,7 @@ void LLViewerRegion::updateNetStats() mLastPacketsLost = mPacketsLost; mPacketsIn = cdp->getPacketsIn(); - mBitsIn = cdp->getBytesIn(); + mBitsIn = 8 * cdp->getBytesIn(); mPacketsOut = cdp->getPacketsOut(); mPacketsLost = cdp->getPacketsLost(); mPingDelay = cdp->getPingDelay(); @@ -2817,6 +2817,7 @@ void LLViewerRegion::unpackRegionHandshake() void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { capabilityNames.append("AbuseCategories"); + //capabilityNames.append("AcceptFriendship"); capabilityNames.append("AgentPreferences"); capabilityNames.append("AgentState"); capabilityNames.append("AttachmentResources"); @@ -2826,6 +2827,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("ChatSessionRequest"); capabilityNames.append("CopyInventoryFromNotecard"); capabilityNames.append("CreateInventoryCategory"); + //capabilityNames.append("DeclineFriendship"); capabilityNames.append("DispatchRegionInfo"); capabilityNames.append("DirectDelivery"); capabilityNames.append("EnvironmentSettings"); |