diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-25 14:51:29 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2011-03-25 14:51:29 -0400 |
| commit | 534ac19ed5a6abe68ea654a5444b7e486f8ce06a (patch) | |
| tree | 7f50cfebe34b2c5853a6af93e8992bf2909d0ba4 /indra/newview/llfloatertools.cpp | |
| parent | 9f2987d995e8a2273f723a387dd587c3dc988056 (diff) | |
| parent | 44774cd265306c6d29f0a63c0876c7fa7b84311e (diff) | |
merge from mesh-development to nyx-mesh-development
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index a0e83902ea..891641b159 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -789,7 +789,9 @@ void LLFloaterTools::updatePopup(LLCoordGL center, MASK mask) getChildView("Strength:")->setVisible( land_visible); } - bool show_mesh_cost = !gAgent.getRegion()->getCapability("GetMesh").empty() && gSavedSettings.getBOOL("MeshEnabled"); + bool show_mesh_cost = gAgent.getRegion() && + !gAgent.getRegion()->getCapability("GetMesh").empty() && + gSavedSettings.getBOOL("MeshEnabled"); getChildView("obj_count")->setVisible( !land_visible && !show_mesh_cost); getChildView("prim_count")->setVisible( !land_visible && !show_mesh_cost); |