From 8f7ec64899c54dcee6caa0307510cc4003ba7bdd Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Mon, 27 Jul 2009 17:56:26 +0000
Subject: Merged skinning-17 into viewer-2 for bug fixes.  Commented out new IM
 window for now, not complete. Merging revisions 127913-128319 of
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into
 D:\viewer-2.0.0-3, respecting ancestry

---
 indra/newview/llpanelpick.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llpanelpick.cpp')

diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp
index 961c54d667..cda1a9e7e7 100644
--- a/indra/newview/llpanelpick.cpp
+++ b/indra/newview/llpanelpick.cpp
@@ -38,6 +38,7 @@
 #include "llpanel.h"
 #include "message.h"
 #include "llagent.h"
+#include "llbutton.h"
 #include "llparcel.h"
 #include "llviewerparcelmgr.h"
 #include "lltexturectrl.h"
-- 
cgit v1.2.3