Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add support for GetMesh2

Browse Source 
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!
This commit is contained in:
Aleric Inglewood
2013-09-29 01:00:30 +02:00
parent 1c0f87d82f
commit 1ef90525b7
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llmeshrepository.cpp
View File

@@ -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");
}
}
}

3
indra/newview/llviewerregion.cpp
View File

@@ -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
{