diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-06-07 14:42:54 -0500 |
| commit | f1784209d5fc4e3f9402fbc8fa66de5a67a73f70 (patch) | |
| tree | 56922332d7fce623e1ad973e09f72d9dd982b289 /indra/newview/llpanelvolume.cpp | |
| parent | 690f18c948003c9d14524da8cdf5b82da8227758 (diff) | |
| parent | 81af06c95490a54e69b6bbf01ae2ef98adb66a02 (diff) | |
merge
Diffstat (limited to 'indra/newview/llpanelvolume.cpp')
| -rw-r--r-- | indra/newview/llpanelvolume.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/llpanelvolume.cpp b/indra/newview/llpanelvolume.cpp index 7839cdd811..bb87601d20 100644 --- a/indra/newview/llpanelvolume.cpp +++ b/indra/newview/llpanelvolume.cpp @@ -530,17 +530,24 @@ void LLPanelVolume::refresh() getChildView("Light Ambiance")->setVisible( visible); getChildView("light texture control")->setVisible( visible); - bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && - gAgent.getRegion() && - !gAgent.getRegion()->getCapability("GetMesh").empty() && - !gAgent.getRegion()->getCapability("ObjectAdd").empty(); + bool enable_mesh = false; + LLSD sim_features; + LLViewerRegion *region = gAgent.getRegion(); + if(region) + { + LLSD sim_features; + region->getSimulatorFeatures(sim_features); + enable_mesh = sim_features.has("PhysicsShapeTypes"); + } getChildView("label physicsshapetype")->setVisible(enable_mesh); getChildView("Physics Shape Type Combo Ctrl")->setVisible(enable_mesh); getChildView("Physics Gravity")->setVisible(enable_mesh); getChildView("Physics Friction")->setVisible(enable_mesh); getChildView("Physics Density")->setVisible(enable_mesh); getChildView("Physics Restitution")->setVisible(enable_mesh); + + /* TODO: add/remove individual physics shape types as per the PhysicsShapeTypes simulator features */ } |