diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-10-04 16:31:48 +0000 |
| commit | 4942a7b77917f9a163453ecdd040993965672cc0 (patch) | |
| tree | 3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/newview | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterland.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llpanelland.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llurl.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 |
5 files changed, 0 insertions, 11 deletions
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" |