summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateroutbox.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-08-11 12:18:47 -0700
committerRider Linden <rider@lindenlab.com>2015-08-11 12:18:47 -0700
commit9df2e7e4cb11a3ca7fabc2a3c443564da18b9a13 (patch)
tree29f0229aa5ad443ed36d56a2dca0102fd83c1447 /indra/newview/llfloateroutbox.h
parent5a0025026cee93eb657290544b95eb00557ae5f1 (diff)
parent310ec101dfd2c69ecc1a51d0a3a8ea12d5fdaf7a (diff)
Merge
Diffstat (limited to 'indra/newview/llfloateroutbox.h')
-rwxr-xr-xindra/newview/llfloateroutbox.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateroutbox.h b/indra/newview/llfloateroutbox.h
index 40519c8fd2..2cf69fc3cc 100755
--- a/indra/newview/llfloateroutbox.h
+++ b/indra/newview/llfloateroutbox.h
@@ -1,7 +1,6 @@
/**
* @file llfloateroutbox.h
- * @brief LLFloaterOutbox
- * class definition
+ * @brief Implementation of the merchant outbox window
*
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
* Second Life Viewer Source Code
@@ -30,6 +29,7 @@
#include "llfloater.h"
#include "llfoldertype.h"
+#include "llinventoryfilter.h"
#include "llnotificationptr.h"