summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-03-03 11:26:25 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-03-03 11:26:25 +0000
commit6ecec59fda7d248d2640cb0a4fd95276604755a9 (patch)
tree063583a1f9f7441356814be5891e6a7bcc61b9d4 /indra/newview/llinventorypanel.cpp
parent1eff2a33b1fab8ebe757ce30b36dc71df5b58cb9 (diff)
parent5777dfaae6268dffee83d7a457c024b1a89f81ff (diff)
Merge from viewer-2-0
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();
}
}