diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-06-19 11:35:20 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-06-19 11:35:20 -0700 |
| commit | 3af9d7c0535c8d94b194952c98196bac1d8c3dda (patch) | |
| tree | 68b347e9303f814de271cc27f38f19ae5a6fa4e2 /indra/newview/llnearbychat.cpp | |
| parent | b882fe3b8dde9338c092922672015f975ca09587 (diff) | |
| parent | ad4ae5583534197cb00c13d769e504fcde4d19d5 (diff) | |
Merge pull from richard/viewer-chui
Diffstat (limited to 'indra/newview/llnearbychat.cpp')
| -rw-r--r-- | indra/newview/llnearbychat.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/newview/llnearbychat.cpp b/indra/newview/llnearbychat.cpp index fbaf451412..1b2d9b6801 100644 --- a/indra/newview/llnearbychat.cpp +++ b/indra/newview/llnearbychat.cpp @@ -130,6 +130,7 @@ LLNearbyChat::LLNearbyChat(const LLSD& key) mSpeakerMgr(NULL), mExpandedHeight(COLLAPSED_HEIGHT + EXPANDED_HEIGHT) { + mKey = LLSD(); mIsNearbyChat = true; mSpeakerMgr = LLLocalSpeakerMgr::getInstance(); } @@ -382,11 +383,6 @@ LLNearbyChat* LLNearbyChat::getInstance() return LLFloaterReg::getTypedInstance<LLNearbyChat>("chat_bar"); } -//static -//LLNearbyChat* LLNearbyChat::findInstance() -//{ -// return LLFloaterReg::findTypedInstance<LLNearbyChat>("chat_bar"); -//} void LLNearbyChat::showHistory() { @@ -397,10 +393,6 @@ void LLNearbyChat::showHistory() storeRectControl(); } -void LLNearbyChat::showTranslationCheckbox(BOOL show) -{ - getChild<LLUICtrl>("translate_chat_checkbox_lp")->setVisible(show); -} BOOL LLNearbyChat::tick() { |