diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-05-27 11:50:39 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-05-27 11:50:39 -0700 |
| commit | 31e850d04885bed2ac779c66bb6b7923a0a51d96 (patch) | |
| tree | 834cac4630edfae9dca3d44e9c20b1d1c68ff484 /indra/newview/llpanelobject.cpp | |
| parent | 51bc6c01c10723d1682392fe8a15528fc7f4b7cb (diff) | |
transplant fix for SH-1467
viewer now uses simulatorfeatures to check whether to show
UI elements for mesh or not
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 34a92cd0ac..61241e3ce5 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -64,6 +64,7 @@ #include "pipeline.h" #include "llviewercontrol.h" #include "lluictrlfactory.h" +#include "llmeshrepository.h" //#include "llfirstuse.h" #include "lldrawpool.h" @@ -1740,9 +1741,7 @@ void LLPanelObject::refresh() mRootObject = NULL; } - bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && - gAgent.getRegion() && - !gAgent.getRegion()->getCapability("GetMesh").empty(); + bool enable_mesh = gMeshRepo.meshRezEnabled(); F32 max_scale = get_default_max_prim_scale(LLPickInfo::isFlora(mObject)); |