summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-17 12:59:00 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-17 12:59:00 -0500
commit52c4711ab0fce2444e6f89fcdd9898245f27a87d (patch)
treeaf1780f2216a0dad0a0b9f196b140106ca65beae /indra/newview/llinventorypanel.cpp
parenta383a38b0c1b5ae02cf8b8a3d5e6ccb3924b8766 (diff)
parent33a3a0d156c3664dc9a61353c7b63f9343b0d1f5 (diff)
Automated merge with file:///Users/chuck/Documents/hg/viewer-hotfix
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index ca9b942629..048ed10886 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -290,8 +290,12 @@ void LLInventoryPanel::modelChanged(U32 mask)
if(bridge)
{ // Clear the display name first, so it gets properly re-built during refresh()
bridge->clearDisplayName();
+
+ view_item->refresh();
+
+ // Set the new tooltip with the new display name.
+ view_item->setToolTip(bridge->getDisplayName());
}
- view_item->refresh();
}
}