summaryrefslogtreecommitdiff
path: root/indra/newview/llinspecttexture.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-04-24 19:48:36 +0300
committerGitHub <noreply@github.com>2024-04-24 19:48:36 +0300
commit3c833ce035c87e0f03ec8e46894d10adb33ad820 (patch)
treef2ee6c215244bdea45440b1a753c83d19eace121 /indra/newview/llinspecttexture.cpp
parentea4ddb5f40ee8dd253be0ac4229de90f1eef61a3 (diff)
parent3713c33098ab98d840c0ed20bcbb5a1cb8e15235 (diff)
Merge pull request #1314 from secondlife/marchcat/b-merge
Release (Maint YZ) -> Maint B merge
Diffstat (limited to 'indra/newview/llinspecttexture.cpp')
-rw-r--r--indra/newview/llinspecttexture.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinspecttexture.cpp b/indra/newview/llinspecttexture.cpp
index da4e3c0949..76e428b7d0 100644
--- a/indra/newview/llinspecttexture.cpp
+++ b/indra/newview/llinspecttexture.cpp
@@ -84,7 +84,10 @@ LLToolTip* LLInspectTextureUtil::createInventoryToolTip(LLToolTip::Params p)
}
}
}
-
+ if ((!p.message.isProvided() || p.message().empty()))
+ {
+ return NULL;
+ }
// No or more than one texture found => show default tooltip
return LLUICtrlFactory::create<LLToolTip>(p);
}