summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatergesture.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-02 16:22:18 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-02 16:22:18 -0500
commit310a7b60f7d3af1e14cdd91c94e8a5841b182a4c (patch)
tree13d1b6caea6c93169ee643ec3cff06a1d8a02d17 /indra/newview/llfloatergesture.cpp
parentcdf639087011dc7f4510cedd9951e8d890818b97 (diff)
parentbde7d67066d189416a725da4527a02eb4f78ba4a (diff)
Merge conflict resolution for previous commit.
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloatergesture.cpp')
-rw-r--r--indra/newview/llfloatergesture.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp
index 1300103423..c114eed4a2 100644
--- a/indra/newview/llfloatergesture.cpp
+++ b/indra/newview/llfloatergesture.cpp
@@ -44,6 +44,7 @@
#include "llcombobox.h"
#include "llgesturemgr.h"
#include "llinventorymodel.h"
+#include "llinventorypanel.h"
#include "llfloaterinventory.h"
#include "llkeyboard.h"
#include "lllineeditor.h"