summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpermissions.h
diff options
context:
space:
mode:
authorSam Kolb <skolb@lindenlab.com>2007-09-11 20:48:08 +0000
committerSam Kolb <skolb@lindenlab.com>2007-09-11 20:48:08 +0000
commit55e52f363195ca7428a2b3773d8488d09e62b04d (patch)
treea2622bb2524f8c110a5c5c1d09ecc5d2307c16a2 /indra/newview/llpanelpermissions.h
parent96830697b2f3bb8d1d7e1c4a3a6872845a38926c (diff)
Merge sl-search-m0 back into release
Diffstat (limited to 'indra/newview/llpanelpermissions.h')
-rw-r--r--indra/newview/llpanelpermissions.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llpanelpermissions.h b/indra/newview/llpanelpermissions.h
index 48c52b56b9..4cc276ff06 100644
--- a/indra/newview/llpanelpermissions.h
+++ b/indra/newview/llpanelpermissions.h
@@ -9,10 +9,7 @@
#ifndef LL_LLPANELPERMISSIONS_H
#define LL_LLPANELPERMISSIONS_H
-#ifndef LL_LLPANEL_H
#include "llpanel.h"
-#endif
-
#include "lluuid.h"
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~