diff options
| author | elektrahesse | 2010-09-29 22:29:01 +0200 |
|---|---|---|
| committer | elektrahesse | 2010-09-29 22:29:01 +0200 |
| commit | a68441b93fe69b1f2de45f262ab6175ba651edee (patch) | |
| tree | 12561e87fffec1b3aa6d9f38dcd214d722f1e0fc /linden | |
| parent | Fixed a mismatch in control naming causing the viewer to crash at startup (diff) | |
| download | meta-impy-a68441b93fe69b1f2de45f262ab6175ba651edee.zip meta-impy-a68441b93fe69b1f2de45f262ab6175ba651edee.tar.gz meta-impy-a68441b93fe69b1f2de45f262ab6175ba651edee.tar.bz2 meta-impy-a68441b93fe69b1f2de45f262ab6175ba651edee.tar.xz | |
Reverted to previous version to avoid crash on local chat open.
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llfloateractivespeakers.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp index f8c3166..51e7b89 100644 --- a/linden/indra/newview/llfloateractivespeakers.cpp +++ b/linden/indra/newview/llfloateractivespeakers.cpp | |||
| @@ -511,9 +511,7 @@ void LLPanelActiveSpeakers::refreshSpeakers() | |||
| 511 | } | 511 | } |
| 512 | else | 512 | else |
| 513 | { | 513 | { |
| 514 | static LLColor4* sDefaultListText = rebind_llcontrol<LLColor4>("DefaultListText", &gColors, true); | 514 | name_cell->setColor(LLColor4::black); |
| 515 | |||
| 516 | name_cell->setColor((*sDefaultListText)); | ||
| 517 | } | 515 | } |
| 518 | 516 | ||
| 519 | std::string speaker_name; | 517 | std::string speaker_name; |