diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-29 17:12:57 -0800 |
commit | 04bfd00a5d8ae7326211d867af7c3f577ff06763 (patch) | |
tree | b0547199d04dc7ccec94b451f05b5ce7e24e3703 /indra/newview/llfloaterbulkpermission.h | |
parent | aaae230bb135b9e57edb12a7374c711fd7e4adb4 (diff) | |
parent | 7e0a3ce7359a01ffa7776d86f279409225c3c2a7 (diff) |
merge.
Diffstat (limited to 'indra/newview/llfloaterbulkpermission.h')
-rw-r--r-- | indra/newview/llfloaterbulkpermission.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbulkpermission.h b/indra/newview/llfloaterbulkpermission.h index 31f4f5c3e1..bffcff7059 100644 --- a/indra/newview/llfloaterbulkpermission.h +++ b/indra/newview/llfloaterbulkpermission.h @@ -44,8 +44,6 @@ #include "llfloater.h" #include "llscrolllistctrl.h" -#include "llviewerinventory.h" - class LLFloaterBulkPermission : public LLFloater, public LLVOInventoryListener { friend class LLFloaterReg; |