diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:14 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:14 -0600 |
| commit | 1da7f4222479cc98bb85341de6a3bc93cd6fa4b4 (patch) | |
| tree | dea648af2d44204f1abf1e84f07ede3317629157 /indra/newview/llnearbychatbar.h | |
| parent | 5374e544ed5888548bea334bd8ca7ca53372d031 (diff) | |
| parent | 06a2d4eb274b1cd02b82bf2e5ffb458880ae8517 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnearbychatbar.h')
| -rw-r--r-- | indra/newview/llnearbychatbar.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llnearbychatbar.h b/indra/newview/llnearbychatbar.h index e9734899b3..c2f57dc4ca 100644 --- a/indra/newview/llnearbychatbar.h +++ b/indra/newview/llnearbychatbar.h @@ -84,9 +84,10 @@ protected: // Which non-zero channel did we last chat on? static S32 sLastSpecialChatChannel; - LLLineEditor* mChatBox; - LLOutputMonitorCtrl* mOutputMonitor; - LLLocalSpeakerMgr* mSpeakerMgr; + LLLineEditor* mChatBox; + LLView* mNearbyChat; + LLOutputMonitorCtrl* mOutputMonitor; + LLLocalSpeakerMgr* mSpeakerMgr; S32 mExpandedHeight; }; |