summaryrefslogtreecommitdiff
path: root/indra/newview/llinspecttexture.cpp
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-04-24 19:53:29 +0300
committerGitHub <noreply@github.com>2024-04-24 19:53:29 +0300
commite5b14e4c2ceac66cd1083c497f4bc4edc4e43436 (patch)
treefa37803eb1815775a10c86264c643a932a87fca9 /indra/newview/llinspecttexture.cpp
parentb1b2ae00cad6c624ae3ce45bd27bc07f48ce70dd (diff)
parent195a6c56f4899790c5016b5d5b8cb701134a514f (diff)
Merge pull request #1315 from secondlife/marchcat/c-merge
Release (Maint YZ) -> Maint C 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 a8c638aa68..81e60219fa 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);
}