diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 2e4a2b3dbe..97a9221c26 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -408,6 +408,12 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, { LL_WARNS() << "Bogus volume parameters in object " << getID() << LL_ENDL; LL_WARNS() << getRegion()->getOriginGlobal() << LL_ENDL; + // [FIRE-16995] [CRASH] Continuous crashing upon entering 3 adjacent sims incl. Hathian, D8, Devil's Pocket + // A bad object entry in a .slc simobject cache can result in an unreadable/unusable volume + // This leaves the volume in an uncertain state and can result in a crash when later code access an uninitialised pointer + // return an INVALID_UPDATE instead + return(INVALID_UPDATE); + // } volume_params.setSculptID(sculpt_id, sculpt_type);