diff options
| author | seth_productengine <none@none> | 2011-07-25 17:58:35 +0300 |
|---|---|---|
| committer | seth_productengine <none@none> | 2011-07-25 17:58:35 +0300 |
| commit | ce0a1f39aa7f05421025fa5e77422169d2603573 (patch) | |
| tree | ddd6a9bb5b0d7beb0a648dc9e40ae120ffb0d655 /indra/newview | |
| parent | 50b9c63382121df879680cf43f5be6fc09686607 (diff) | |
SH-1941 FIXED Mesh upload menu enabled when avatar is in the region that does not allow building but supports mesh upload.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llmeshrepository.cpp | 3 |
1 files changed, 1 insertions, 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(); |