diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 07:52:41 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-02 07:52:41 +0100 |
| commit | 9354571174af49849b56b5cc2a81c8d65f59cdfe (patch) | |
| tree | b58806fc9fad9c38a48d6d9d042bad0cbf308f80 /indra/newview/llchathistory.h | |
| parent | 605a4a459e23073814e8ce18c8e9997a9e01fab0 (diff) | |
| parent | 813d4cc8a336e0ef66d0f368269f5c10d9817c59 (diff) | |
merge.
Diffstat (limited to 'indra/newview/llchathistory.h')
| -rw-r--r-- | indra/newview/llchathistory.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llchathistory.h b/indra/newview/llchathistory.h index 950b32861b..fa1f2e04a4 100644 --- a/indra/newview/llchathistory.h +++ b/indra/newview/llchathistory.h @@ -122,7 +122,6 @@ class LLChatHistory : public LLUICtrl */ void appendMessage(const LLChat& chat, const LLSD &args = LLSD(), const LLStyle::Params& input_append_params = LLStyle::Params()); /*virtual*/ void clear(); - /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); private: std::string mLastFromName; |