From d60f16540dba5616cd8260046b44ebc2a1047065 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 4 Jan 2007 02:04:29 +0000 Subject: svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 This turned up the following "lost" changes: llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly llfontgl.cpp (from maintenance r50207) - whitespace only inventorybridge.cpp (property - non-executable) skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL --- indra/newview/llvoavatar.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llvoavatar.cpp') diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index d1e4de5478..d1bcacb5c4 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -35,7 +35,6 @@ #include "lldrawable.h" #include "lldrawpoolavatar.h" #include "lldrawpoolalpha.h" -#include "lldrawpoolmedia.h" #include "lldrawpoolbump.h" #include "lldriverparam.h" #include "lleditingmotion.h" -- cgit v1.3