From ce7682c2a468e926d6b38e4f95bd289a8d26222c Mon Sep 17 00:00:00 2001 From: Bryan O'Sullivan Date: Wed, 18 Jul 2007 21:22:40 +0000 Subject: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release (only inside indra) (josh) Original log message was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance bos updated it to be: svn merge -r64837:65269 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance However, it appears it actually was: svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance ... missing some file additions. --- indra/newview/llpanellogin.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/newview/llpanellogin.h') diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index 801b06ba55..d9d933400f 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -15,6 +15,7 @@ #include "llmemory.h" #include "llviewerimage.h" #include "llstring.h" +#include "llmd5.h" class LLTextBox; class LLLineEditor; -- cgit v1.2.3