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/llinventory | |
| parent | 9fc7049151a16e3722c6ce90899e3c7b63161615 (diff) | |
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llinventory.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/lllandmark.cpp | 3 | ||||
| -rw-r--r-- | indra/llinventory/llparcel.h | 4 | ||||
| -rw-r--r-- | indra/llinventory/llpermissions.h | 3 | ||||
| -rw-r--r-- | indra/llinventory/llsaleinfo.h | 3 |
5 files changed, 0 insertions, 15 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" diff --git a/indra/llinventory/lllandmark.cpp b/indra/llinventory/lllandmark.cpp index 7cb145d386..0887d28903 100644 --- a/indra/llinventory/lllandmark.cpp +++ b/indra/llinventory/lllandmark.cpp @@ -9,10 +9,7 @@ #include "linden_common.h" #include "lllandmark.h" -#include <stdlib.h> -#include <string.h> #include <errno.h> -#include <stdio.h> // for sscanf() on linux #include "message.h" #include "llregionhandle.h" diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index d50c4f0d3b..b80fa58cd5 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -8,10 +8,6 @@ #ifndef LL_LLPARCEL_H #define LL_LLPARCEL_H -#include <time.h> -#include <iostream> - -#include "lldarray.h" #include "lluuid.h" #include "llparcelflags.h" #include "llpermissions.h" diff --git a/indra/llinventory/llpermissions.h b/indra/llinventory/llpermissions.h index 131db1a635..8c9064306e 100644 --- a/indra/llinventory/llpermissions.h +++ b/indra/llinventory/llpermissions.h @@ -9,9 +9,6 @@ #ifndef LL_LLPERMISSIONS_H #define LL_LLPERMISSIONS_H -#include <stdio.h> -#include <iostream> - #include "llpermissionsflags.h" #include "llsd.h" #include "lluuid.h" diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h index 2eceea87ef..30218459d5 100644 --- a/indra/llinventory/llsaleinfo.h +++ b/indra/llinventory/llsaleinfo.h @@ -9,9 +9,6 @@ #ifndef LL_LLSALEINFO_H #define LL_LLSALEINFO_H -#include <stdio.h> -#include <iostream> - #include "llpermissionsflags.h" #include "llsd.h" #include "llxmlnode.h" |