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

Preparing to add mesh upload.

Browse Source
This commit is contained in:
Siana Gearz
2011-12-02 09:30:12 +01:00
parent aeb766ee37
commit 697dd7e929
22 changed files with 7700 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
indra/newview/llviewerregion.cpp
View File

@@ -1732,17 +1732,29 @@ std::string LLViewerRegion::getDescription() const
return stringize(*this);
}
#if MESH_ENABLED
bool LLViewerRegion::meshUploadEnabled() const
{
return (mSimulatorFeatures.has("MeshUploadEnabled") &&
mSimulatorFeatures["MeshUploadEnabled"].asBoolean());
if (getCapability("SimulatorFeatures").empty())
{
return !getCapability("MeshUploadFlag").empty();
}
else
{
return (mSimulatorFeatures.has("MeshUploadEnabled") &&
mSimulatorFeatures["MeshUploadEnabled"].asBoolean());
}
}
bool LLViewerRegion::meshRezEnabled() const
{
return (mSimulatorFeatures.has("MeshRezEnabled") &&
if (getCapability("SimulatorFeatures").empty())
{
return !getCapability("GetMesh").empty();
}
else
{
return (mSimulatorFeatures.has("MeshRezEnabled") &&
mSimulatorFeatures["MeshRezEnabled"].asBoolean());
}
}
#endif //MESH_ENABLED