diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 14:01:35 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 14:01:35 -0800 |
commit | 50e696872ecebd37e8a43df3031e4cdaf26147a9 (patch) | |
tree | 7a0eadbb49db2b1d37306c89e588d2ae64510145 /indra/newview/llinventorypanel.cpp | |
parent | 1c0603bef2bac6e006df7566aa2a3f8c351a1b7f (diff) | |
parent | 5fd3f8e61c9c37c4cf6a1aabc11f2f9ee710053f (diff) |
Automated merge with ssh://rick@hg.lindenlab.com/q/viewer-hotfix/
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r-- | indra/newview/llinventorypanel.cpp | 6 |
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(); } } |