diff options
Diffstat (limited to 'indra/newview/llmeshrepository.cpp')
| -rwxr-xr-x | indra/newview/llmeshrepository.cpp | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index d8024b362e..7ac06f46d1 100755 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -61,6 +61,7 @@ #include "pipeline.h"
#include "llinventorymodel.h"
#include "llfoldertype.h"
+#include "llviewerparcelmgr.h"
#include "boost/lexical_cast.hpp"
@@ -3976,3 +3977,33 @@ void LLMeshRepository::buildPhysicsMesh(LLModel::Decomposition& decomp) }
}
}
+
+
+bool LLMeshRepository::meshUploadEnabled()
+{
+ LLViewerRegion *region = gAgent.getRegion();
+ if(gSavedSettings.getBOOL("MeshEnabled") &&
+ LLViewerParcelMgr::getInstance()->allowAgentBuild() &&
+ region)
+ {
+ LLSD sim_features;
+ region->getSimulatorFeatures(sim_features);
+ return (sim_features.has("MeshUploadEnabled") &&
+ sim_features["MeshUploadEnabled"].asBoolean());
+ }
+ return false;
+}
+
+bool LLMeshRepository::meshRezEnabled()
+{
+ LLViewerRegion *region = gAgent.getRegion();
+ if(gSavedSettings.getBOOL("MeshEnabled") &&
+ region)
+ {
+ LLSD sim_features;
+ region->getSimulatorFeatures(sim_features);
+ return (sim_features.has("MeshRezEnabled") &&
+ sim_features["MeshRezEnabled"].asBoolean());
+ }
+ return false;
+}
|