diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:31 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-11-29 12:10:31 -0600 |
| commit | 893b5e16b81ead08ef22b03594e0a835df525778 (patch) | |
| tree | 25166e9edda070e62780d69d0061cb5c197b21a8 /indra/newview/llnearbychatbar.h | |
| parent | d22584bfe51c034076d9e8df01f70628abc22f85 (diff) | |
| parent | 1da7f4222479cc98bb85341de6a3bc93cd6fa4b4 (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; }; |