diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 14:59:23 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 14:59:23 -0800 |
| commit | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (patch) | |
| tree | 26640bea40cb3913ab9d30ac99eeec936679a5ff /indra/newview/llnearbychatbar.cpp | |
| parent | 8b4818430fc120443b9dc677ae10fd072fffb6e6 (diff) | |
Redo Bao's broken merge
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
| -rw-r--r-- | indra/newview/llnearbychatbar.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 32dc5e5927..d7a5ff289c 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -77,6 +77,10 @@ LLGestureComboBox::LLGestureComboBox(const LLGestureComboBox::Params& p) // refresh list from current active gestures refreshGestures(); + + // This forces using of halign from xml, since LLComboBox + // sets it to LLFontGL::LEFT, if text entry is disabled + mButton->setHAlign(p.drop_down_button.font_halign); } LLGestureComboBox::~LLGestureComboBox() @@ -207,6 +211,7 @@ LLNearbyChatBar::LLNearbyChatBar() : LLPanel() , mChatBox(NULL) { + mSpeakerMgr = LLLocalSpeakerMgr::getInstance(); } //virtual @@ -516,8 +521,8 @@ void LLNearbyChatBar::displaySpeakingIndicator() LLUUID id; id.setNull(); - mSpeakerMgr.update(TRUE); - mSpeakerMgr.getSpeakerList(&speaker_list, FALSE); + mSpeakerMgr->update(TRUE); + mSpeakerMgr->getSpeakerList(&speaker_list, FALSE); for (LLSpeakerMgr::speaker_list_t::iterator i = speaker_list.begin(); i != speaker_list.end(); ++i) { |