diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2009-12-02 19:38:54 +0200 |
commit | a2e23aa3d9f6e8c156e97244a7694256f41f93c3 (patch) | |
tree | 1d7f37f638b7a17312164384b5b51216a34d6346 /indra/newview/llcallfloater.h | |
parent | eae60da6839906059d904c12cc155f4c2738c893 (diff) | |
parent | aa84c4afff251d771c7571803ccce56d1f439ae2 (diff) |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llcallfloater.h')
-rw-r--r-- | indra/newview/llcallfloater.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llcallfloater.h b/indra/newview/llcallfloater.h index d0a2ca5303..b615f57d5b 100644 --- a/indra/newview/llcallfloater.h +++ b/indra/newview/llcallfloater.h @@ -37,6 +37,7 @@ #include "lldockablefloater.h" class LLAvatarList; +class LLNonAvatarCaller; class LLParticipantList; class LLSpeakerMgr; @@ -91,6 +92,7 @@ private: LLSpeakerMgr* mSpeakerManager; LLParticipantList* mPaticipants; LLAvatarList* mAvatarList; + LLNonAvatarCaller* mNonAvatarCaller; EVoiceControls mVoiceType; boost::signals2::connection mChannelChangedConnection; |