summaryrefslogtreecommitdiff
path: root/indra/newview/llnearbychatbar.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:16:18 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:16:18 -0800
commitb34b82f7fea702b7cb4309195314c45fd3d2e630 (patch)
tree8af0d2b7f2670902d9b3d7cf878081ffd7aacab7 /indra/newview/llnearbychatbar.cpp
parent06ba4927aa8d288b843ed1380132c14938708707 (diff)
parentdc5db676efd340bccd2c6f376c0bcba77e0507c4 (diff)
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r--indra/newview/llnearbychatbar.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp
index bcb4edd7c1..d54545971b 100644
--- a/indra/newview/llnearbychatbar.cpp
+++ b/indra/newview/llnearbychatbar.cpp
@@ -695,11 +695,6 @@ LLWString LLNearbyChatBar::stripChannelNumber(const LLWString &mesg, S32* channe
}
}
-void LLNearbyChatBar::setPTTState(bool state)
-{
- mSpeakBtn->setSpeakBtnToggleState(state);
-}
-
void send_chat_from_viewer(const std::string& utf8_out_text, EChatType type, S32 channel)
{
LLMessageSystem* msg = gMessageSystem;