livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout 522df070aa0f "Utilize new GetMesh2 simulator cap"

Cinders 2013-09-29 16:06:02 -06:00
parent 0acdd20e3c
commit 1761ced217
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llmeshrepository.cpp
View File

@ -2710,9 +2710,7 @@ void LLMeshRepository::notifyLoadedMeshes()
if (gAgent.getRegion()->getName() != region_name && gAgent.getRegion()->capabilitiesReceived())
{
region_name = gAgent.getRegion()->getName();
mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh2");
if (mGetMeshCapability.empty())
mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh");
mGetMeshCapability = gAgent.getRegion()->getCapability("GetMesh");
}
}

1
indra/newview/llviewerregion.cpp
View File

@ -1765,7 +1765,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("GetDisplayNames");
capabilityNames.append("GroupMemberData");
capabilityNames.append("GetMesh");
capabilityNames.append("GetMesh2");
capabilityNames.append("GetObjectCost");
capabilityNames.append("GetObjectPhysicsData");
capabilityNames.append("GetTexture");