diff options
| author | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-07 13:34:13 -0700 |
| commit | 88a90aabcb5bdede24bb451d443239e1e116c4ea (patch) | |
| tree | 9399a4aefc1a9017986e1c29f9c9077d6e3c74c7 /indra/newview/llagentwearables.cpp | |
| parent | 66dcc72870b19c6ada65a643ca33c779c9c9989b (diff) | |
| parent | 8f7579e4e46bb8da9fece3125ae31c3bb885be96 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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" |