From 4942a7b77917f9a163453ecdd040993965672cc0 Mon Sep 17 00:00:00 2001
From: Aaron Brashears <aaronb@lindenlab.com>
Date: Thu, 4 Oct 2007 16:31:48 +0000
Subject: Result of svn merge -r70873:71086
 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.

---
 indra/newview/llfloaterland.cpp   | 1 -
 indra/newview/llpanelland.cpp     | 2 --
 indra/newview/llurl.cpp           | 1 -
 indra/newview/llviewermessage.cpp | 2 --
 indra/newview/llviewerwindow.cpp  | 5 -----
 5 files changed, 11 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp
index e0ceedf0f7..be410196c5 100644
--- a/indra/newview/llfloaterland.cpp
+++ b/indra/newview/llfloaterland.cpp
@@ -9,7 +9,6 @@
 #include "llviewerprecompiledheaders.h"
 
 #include <sstream>
-#include <time.h>
 
 #include "llfloaterland.h"
 
diff --git a/indra/newview/llpanelland.cpp b/indra/newview/llpanelland.cpp
index 9363b98d12..c16eb83887 100644
--- a/indra/newview/llpanelland.cpp
+++ b/indra/newview/llpanelland.cpp
@@ -8,8 +8,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-#include <time.h>
-
 #include "llpanelland.h"
 
 #include "llparcel.h"
diff --git a/indra/newview/llurl.cpp b/indra/newview/llurl.cpp
index 73444f611d..19d100a561 100644
--- a/indra/newview/llurl.cpp
+++ b/indra/newview/llurl.cpp
@@ -7,7 +7,6 @@
  */
 
 #include "llviewerprecompiledheaders.h"
-#include <string.h>
 #include "llurl.h"
 #include "llerror.h"
 
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index c09dd03dd4..43cf132b57 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -11,8 +11,6 @@
 #include "llviewermessage.h"
 
 #include <deque>
-#include <stdio.h>
-#include <string.h>
 
 #include "audioengine.h" 
 #include "audiosettings.h"
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index d4b87ceba0..afdd762404 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -8,11 +8,6 @@
 
 #include "llviewerprecompiledheaders.h"
 
-// system library includes
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
 #include "llviewerwindow.h"
 #include "llviewquery.h"
 #include "llxmltree.h"
-- 
cgit v1.2.3