Skip to content

Commit

Permalink
Silence 'getCapability called before caps received for' console spam …
Browse files Browse the repository at this point in the history
…when fetching mesh. TODO: Check if a proper workaround is available in V3, as I worry that some meshes that failed the caps check may not get promptly re-generated upon caps receipt.
  • Loading branch information
Shyotl committed Jun 21, 2016
1 parent cd25894 commit f77df0a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion indra/newview/llviewerregion.cpp
Expand Up @@ -2315,7 +2315,11 @@ bool LLViewerRegion::meshUploadEnabled() const

bool LLViewerRegion::meshRezEnabled() const
{
if (getCapability("SimulatorFeatures").empty())
if (!capabilitiesReceived())
{
return false;
}
else if (getCapability("SimulatorFeatures").empty())
{
return !getCapability("GetMesh").empty() || !getCapability("GetMesh2").empty();
}
Expand Down

0 comments on commit f77df0a

Please sign in to comment.