summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-18 11:13:54 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-18 11:13:54 -0500
commit1ca9c1dcfef3a935be30a5322c91d5e3df523a98 (patch)
tree50aa5ccc5924d4296454dd3e8dcee7edddaf520b /indra/newview/llinventorypanel.cpp
parent1ae70e112a466a6ed5baf4e05c1771218c78b2f5 (diff)
parent9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (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();
}
}