diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-05-26 16:58:31 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-05-26 16:58:31 -0400 |
| commit | 7c042e1bcdde65da5629ed64a58ce1f3e23542be (patch) | |
| tree | 45812d2a0dd5e681682a6416b111f46a78604c52 /indra/newview/llpanelobject.cpp | |
| parent | 5a39eeb70fbc47a5a52f53e69ca5d95ed2f5e68a (diff) | |
SH-1467 WIP Viewer checks the wrong cap for mesh-ui disable
Fixes that need to go into trunk because certain Mesh UI elements are showing up on DRTSIM-52. These fixes will probably be overwritten by the actual resolution of SH-1467 but I need this workaround now.
Diffstat (limited to 'indra/newview/llpanelobject.cpp')
| -rw-r--r-- | indra/newview/llpanelobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 34a92cd0ac..b4d0ada196 100644 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -1742,7 +1742,8 @@ void LLPanelObject::refresh() bool enable_mesh = gSavedSettings.getBOOL("MeshEnabled") && gAgent.getRegion() && - !gAgent.getRegion()->getCapability("GetMesh").empty(); + !gAgent.getRegion()->getCapability("GetMesh").empty() && + !gAgent.getRegion()->getCapability("ObjectAdd").empty(); F32 max_scale = get_default_max_prim_scale(LLPickInfo::isFlora(mObject)); |