diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-03-26 11:38:42 -0400 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-03-26 11:38:42 -0400 |
| commit | 1ed3117a6d3d40788245d2b28f2ed7a82380b4bb (patch) | |
| tree | 9157a44eabac3bb169acb0d9a8e272b71754b419 /indra/newview/llchathistory.h | |
| parent | d2cbc6c5b646e334e706e51faafbaa738b0d10a9 (diff) | |
Backed out changeset 686628355e4a as it caused a crash.
Diffstat (limited to 'indra/newview/llchathistory.h')
| -rw-r--r-- | indra/newview/llchathistory.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 950b32861b..dfe5ea98e6 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -47,6 +47,8 @@ class LLChatHistory : public LLUICtrl Optional<std::string> message_header; //Message separator filename Optional<std::string> message_separator; + //Message plaintext separator filename + Optional<std::string> message_plaintext_separator; //Text left padding from the scroll rect Optional<S32> left_text_pad; //Text right padding from the scroll rect @@ -69,6 +71,7 @@ class LLChatHistory : public LLUICtrl Params() : message_header("message_header"), message_separator("message_separator"), + message_plaintext_separator("message_plaintext_separator"), left_text_pad("left_text_pad"), right_text_pad("right_text_pad"), left_widget_pad("left_widget_pad"), @@ -97,6 +100,11 @@ class LLChatHistory : public LLUICtrl */ LLView* getSeparator(); /** + * Builds a message plaintext separator. + * @return pointer to LLView separator object. + */ + LLView* getPlaintextSeparator(); + /** * Builds a message header. * @return pointer to LLView header object. */ @@ -133,6 +141,7 @@ class LLChatHistory : public LLUICtrl std::string mMessageHeaderFilename; std::string mMessageSeparatorFilename; + std::string mMessagePlaintextSeparatorFilename; S32 mLeftTextPad; S32 mRightTextPad; |