From 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 1 Nov 2007 22:02:35 +0000
Subject: svn merge -r 72652:72881
 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.
---
 indra/newview/llweb.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/llweb.cpp b/indra/newview/llweb.cpp
index f908cd2593..7ee4869153 100644
--- a/indra/newview/llweb.cpp
+++ b/indra/newview/llweb.cpp
@@ -36,7 +36,7 @@
 
 #include "llwindow.h"
 
-#include "llfloaterhtml.h"
+//#include "llfloaterhtml.h"
 #include "llviewercontrol.h"
 
 // static
-- 
cgit v1.2.3