diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-03 16:57:48 -0700 |
| commit | ba5760a4d9d110890aab26a394479b36e60915d7 (patch) | |
| tree | acad21a7c576de056bfa21a37027a673feab8fad /indra/newview/llcallfloater.cpp | |
| parent | bd64c483639ae33518609398fce7c51ddc73dae7 (diff) | |
| parent | f2510ca0d629a2cd6cd85588698672f5a0c4e64a (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llcallfloater.cpp')
| -rw-r--r-- | indra/newview/llcallfloater.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index 38b755004c..e767609d74 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -364,7 +364,8 @@ void LLCallFloater::onAvatarListRefreshed() } // static -void LLCallFloater::sOnCurrentChannelChanged(const LLUUID& /*session_id*/) +// This entry point now disable, but left for later use. +void LLCallFloater::onCurrentChannelChanged(const LLUUID& /*session_id*/) { LLVoiceChannel* channel = LLVoiceChannel::getCurrentVoiceChannel(); |