From ce0a1f39aa7f05421025fa5e77422169d2603573 Mon Sep 17 00:00:00 2001 From: seth_productengine Date: Mon, 25 Jul 2011 17:58:35 +0300 Subject: SH-1941 FIXED Mesh upload menu enabled when avatar is in the region that does not allow building but supports mesh upload. --- indra/newview/llmeshrepository.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp index b887842652..4b2fafccd4 100644 --- a/indra/newview/llmeshrepository.cpp +++ b/indra/newview/llmeshrepository.cpp @@ -3502,8 +3502,7 @@ void LLMeshRepository::buildPhysicsMesh(LLModel::Decomposition& decomp) bool LLMeshRepository::meshUploadEnabled() { LLViewerRegion *region = gAgent.getRegion(); - if(gSavedSettings.getBOOL("MeshEnabled") && - LLViewerParcelMgr::getInstance()->allowAgentBuild() && + if(gSavedSettings.getBOOL("MeshEnabled") && region) { return region->meshUploadEnabled(); -- cgit v1.2.3