From f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 Mon Sep 17 00:00:00 2001 From: Aaron Brashears Date: Wed, 13 Jun 2007 18:02:37 +0000 Subject: result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release --- indra/llmessage/llbuffer.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llmessage/llbuffer.h') diff --git a/indra/llmessage/llbuffer.h b/indra/llmessage/llbuffer.h index 0a0a457d56..7933b84e5c 100644 --- a/indra/llmessage/llbuffer.h +++ b/indra/llmessage/llbuffer.h @@ -19,6 +19,7 @@ */ #include +#include /** * @class LLChannelDescriptors -- cgit v1.2.3