summaryrefslogtreecommitdiff
path: root/indra/llinventory/llinventory.cpp
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-10-04 16:31:48 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-10-04 16:31:48 +0000
commit4942a7b77917f9a163453ecdd040993965672cc0 (patch)
tree3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llinventory/llinventory.cpp
parent9fc7049151a16e3722c6ce90899e3c7b63161615 (diff)
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llinventory/llinventory.cpp')
-rw-r--r--indra/llinventory/llinventory.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llinventory/llinventory.cpp b/indra/llinventory/llinventory.cpp
index 60c1ade38f..3c32f7b92c 100644
--- a/indra/llinventory/llinventory.cpp
+++ b/indra/llinventory/llinventory.cpp
@@ -8,8 +8,6 @@
#include "linden_common.h"
-#include <time.h>
-
#include "llinventory.h"
#include "lldbstrings.h"