summaryrefslogtreecommitdiff
path: root/indra/newview/llinspecttexture.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-04-24 20:22:45 +0300
committerGitHub <noreply@github.com>2024-04-24 20:22:45 +0300
commit4c54488470a37f53f46c9d4694644a10b92b9790 (patch)
tree494487bbc57c79d17921b7443003d2a118e24ddb /indra/newview/llinspecttexture.cpp
parent398369233fc2621eb447701e26082057fb0c97d7 (diff)
parent85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (diff)
Merge pull request #1316 from secondlife/marchcat/a-merge
Release (Maint YZ) -> Maint A 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 1d712bb7e2..c8a2bdda7f 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);
}