From 1ef90525b70bf7b057c412fe555a3a7ba4bf0146 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Sun, 29 Sep 2013 01:00:30 +0200 Subject: [PATCH] Add support for GetMesh2 Tested that it's actually being used - and it seems to download everything at high speed. Certainly an improvement. Textures are still *requested* in the wrong order though; for example - baked textures are simply not requested for a long time - while they are even downloaded from another service! --- indra/newview/llmeshrepository.cpp | 6 +++++- indra/newview/llviewerregion.cpp | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index 66ed09f26..55afaecee 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -2412,7 +2412,11 @@ void LLMeshRepository::notifyLoadedMeshes() { region_name = gAgent.getRegion()->getName(); - mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh"); + mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh2"); + if (mGetMeshCapability.empty()) + { + mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh"); + } } } diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index b00bf25ad..9402996b4 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1675,6 +1675,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("GamingData"); //Used by certain grids. capabilityNames.append("GetDisplayNames"); capabilityNames.append("GetMesh"); + capabilityNames.append("GetMesh2"); // Used on SecondLife(tm) sim versions 280647 and higher (13.09.17). capabilityNames.append("GetObjectCost"); capabilityNames.append("GetObjectPhysicsData"); capabilityNames.append("GetTexture"); @@ -2072,7 +2073,7 @@ bool LLViewerRegion::meshRezEnabled() const { if (getCapability("SimulatorFeatures").empty()) { - return !getCapability("GetMesh").empty(); + return !getCapability("GetMesh").empty() || !getCapability("GetMesh2").empty(); } else {