diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index d2e8826e10..36c525b59a 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -3985,6 +3985,13 @@ bool LLViewerRegion::bakesOnMeshEnabled() const bool LLViewerRegion::meshRezEnabled() const { + // FIRE-35602 and many similar reports - Mesh not appearing after TP/login + if(!mSimulatorFeaturesReceived) + { + LL_INFOS("MeshRez") << "MeshRezEnabled: SimulatorFeatures not received yet. Defaulting to true" << LL_ENDL; + return true; + } + // return (mSimulatorFeatures.has("MeshRezEnabled") && mSimulatorFeatures["MeshRezEnabled"].asBoolean()); }