From 43ae8aee6a8719e3bdd87ff2711343dd77edaefc Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 30 Mar 2018 13:11:30 +0000 Subject: SL-440 Obtain Abuse Report categories from capability --- indra/newview/llviewerregion.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llviewerregion.cpp') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index b128e2cd93..bb0dbc6457 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -2816,6 +2816,7 @@ void LLViewerRegion::unpackRegionHandshake() void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) { + capabilityNames.append("AbuseCategories"); capabilityNames.append("AgentPreferences"); capabilityNames.append("AgentState"); capabilityNames.append("AttachmentResources"); -- cgit v1.2.3 From 736549f03fbcd87542aff27dd587923d00ab681e Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 9 Oct 2015 09:26:21 +0200 Subject: STORM-2122: UDP data bandwidth measuring is off by factor 8 --- indra/newview/llviewerregion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llviewerregion.cpp') diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 52dc3fbb69..feaafad2e1 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1877,7 +1877,7 @@ void LLViewerRegion::updateNetStats() mLastPacketsLost = mPacketsLost; mPacketsIn = cdp->getPacketsIn(); - mBitsIn = 8 * cdp->getBytesIn(); + mBitsIn = cdp->getBytesIn(); mPacketsOut = cdp->getPacketsOut(); mPacketsLost = cdp->getPacketsLost(); mPingDelay = cdp->getPingDelay(); -- cgit v1.2.3