diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-17 11:12:27 -0700 |
| commit | c4c8debfc230b4ec6d28c7a84cd2a9bb81d6c894 (patch) | |
| tree | d01f663d3fc1562d773a229e943addb02d14089f /indra/newview/llchatitemscontainerctrl.h | |
| parent | 51865f4e94885471dba0402b33f0b11b72bbdb30 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
Pull merge from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.h')
| -rwxr-xr-x | indra/newview/llchatitemscontainerctrl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.h b/indra/newview/llchatitemscontainerctrl.h index 54b6499d52..f66670ec8c 100755 --- a/indra/newview/llchatitemscontainerctrl.h +++ b/indra/newview/llchatitemscontainerctrl.h @@ -28,6 +28,7 @@ #define LL_LLCHATITEMSCONTAINERCTRL_H_ #include "llchat.h" +#include "llchatmsgbox.h" #include "llpanel.h" #include "llscrollbar.h" #include "llviewerchat.h" @@ -85,6 +86,7 @@ private: LLUUID mFromID; // agent id or object id std::string mFromName; EChatSourceType mSourceType; + LLChatMsgBox* mMsgText; |