summaryrefslogtreecommitdiff
path: root/indra/llinventory/llpermissions.h
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/llpermissions.h
parent9fc7049151a16e3722c6ce90899e3c7b63161615 (diff)
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llinventory/llpermissions.h')
-rw-r--r--indra/llinventory/llpermissions.h3
1 files changed, 0 insertions, 3 deletions
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"