diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2011-06-06 12:55:21 -0700 |
| commit | 73bbcfb07bdb0ea5828a2e214b87c4fabe805eaa (patch) | |
| tree | c395415163893b341dfbc3c54da77b8b924725af /indra/newview/llviewermenufile.cpp | |
| parent | c32b0122ab915ce9bd0cfd8ec330495f2832d97d (diff) | |
| parent | bc014c2e9e17a97c4dc5e0f9cb19654cad4b8980 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 37640ad0d4..b2080a5b82 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -107,9 +107,7 @@ class LLMeshUploadVisible : public view_listener_t { bool handleEvent(const LLSD& userdata) { - return gSavedSettings.getBOOL("MeshEnabled") && - LLViewerParcelMgr::getInstance()->allowAgentBuild() && - !gAgent.getRegion()->getCapability("ObjectAdd").empty(); + return gMeshRepo.meshUploadEnabled(); } }; |