diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp index e4a092c5b9..499aaa1a85 100644 --- a/indra/newview/llinspecttexture.cpp +++ b/indra/newview/llinspecttexture.cpp @@ -33,6 +33,8 @@ #include "lltrans.h" #include "llviewertexturelist.h" +#include "rlvactions.h" + // ============================================================================ // Helper functions @@ -42,6 +44,11 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p) { const LLSD& sdTooltip = p.create_params; + // Texture tooltip RLVa fix + if (!RlvActions::canPreviewTextures()) + return LLUICtrlFactory::create(p); + // + if (sdTooltip.has("thumbnail_id") && sdTooltip["thumbnail_id"].asUUID().notNull()) { // go straight for thumbnail regardless of type