diff options
| author | McCabe Maxsted | 2009-09-11 20:20:13 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-09-11 20:20:13 -0700 |
| commit | 23eb89d76a254235872b530e047c1f39df1d122a (patch) | |
| tree | 95c843ae96607d2c1221dcb49b266d154eae213a /linden/indra/newview/llimpanel.cpp | |
| parent | Fixed profile account info spacing (diff) | |
| parent | Backported clickable object names from 1.23 (diff) | |
| download | meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.zip meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.tar.gz meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.tar.bz2 meta-impy-23eb89d76a254235872b530e047c1f39df1d122a.tar.xz | |
Merged in 1.2.0-objectnames
Diffstat (limited to 'linden/indra/newview/llimpanel.cpp')
| -rw-r--r-- | linden/indra/newview/llimpanel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index f30ae8c..16b0388 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp | |||
| @@ -1543,8 +1543,8 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4 | |||
| 1543 | else | 1543 | else |
| 1544 | { | 1544 | { |
| 1545 | // Convert the name to a hotlink and add to message. | 1545 | // Convert the name to a hotlink and add to message. |
| 1546 | const LLStyleSP &source_style = LLStyleMap::instance().lookup(source); | 1546 | const LLStyleSP &source_style = LLStyleMap::instance().lookupAgent(source); |
| 1547 | mHistoryEditor->appendStyledText(name,false,prepend_newline,&source_style); | 1547 | mHistoryEditor->appendStyledText(name,false,prepend_newline,source_style); |
| 1548 | } | 1548 | } |
| 1549 | prepend_newline = false; | 1549 | prepend_newline = false; |
| 1550 | } | 1550 | } |