diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
| commit | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (patch) | |
| tree | 0e261edeab3e2e3f53a1f3ab825aa76906fff152 /indra/newview/llfloaterchat.h | |
| parent | f5ba6df4c2dc5a5e0842ed028dd4de01406dca3b (diff) | |
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
Diffstat (limited to 'indra/newview/llfloaterchat.h')
| -rw-r--r-- | indra/newview/llfloaterchat.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llfloaterchat.h b/indra/newview/llfloaterchat.h index 042d270aa6..b299d1ad10 100644 --- a/indra/newview/llfloaterchat.h +++ b/indra/newview/llfloaterchat.h @@ -51,6 +51,14 @@ class LLLogChat; class LLVector3d; class LLWindow; +enum ELogOptions +{ + LOG_CHAT = 0, + LOG_IM = 1, + LOG_BOTH_TOGETHER = 2, + LOG_BOTH_SEPARATE = 3 +}; + class LLFloaterChat : public LLFloater { public: |