summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-17 18:47:12 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-17 18:47:12 -0500
commit0aaaa06fe0149ffbc22823daa095749be1abe3e0 (patch)
tree895f584298f3b2d66fc25b86f97b7184910748bf /indra/newview/llinventorypanel.cpp
parenta3c93cccef04b3efc133ef653dbd9e53d7580aeb (diff)
parent29dd5afaa8a85f0b57ddb3e9e281e1e6f5b43e29 (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();
}
}