diff options
author | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-07-08 20:16:35 -0400 |
commit | 093fdcfcd3debd74dc773bf52faa07ea9f5f8b31 (patch) | |
tree | 9b3a0f7e37ef731cb9d35ef4e87c17a4c3c4b255 /indra/newview/llagentwearables.cpp | |
parent | 187bc5211437718016a22e60c7b5ed29823c8510 (diff) | |
parent | 255fc0401ebde80cfde88995a18fc77a36e3479b (diff) |
merge changes for storm-1489
Diffstat (limited to 'indra/newview/llagentwearables.cpp')
-rw-r--r-- | indra/newview/llagentwearables.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index d426afb17c..36272f0c7c 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -33,7 +33,6 @@ #include "llagentwearablesfetch.h" #include "llappearancemgr.h" #include "llcallbacklist.h" -#include "llfolderview.h" #include "llgesturemgr.h" #include "llinventorybridge.h" #include "llinventoryfunctions.h" @@ -45,6 +44,7 @@ #include "llsidepanelappearance.h" #include "llsidetray.h" #include "lltexlayer.h" +#include "lltooldraganddrop.h" #include "llviewerregion.h" #include "llvoavatarself.h" #include "llwearable.h" |