diff options
| author | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-05-02 21:24:47 +0000 |
| commit | 1c909afe3998778e4cc045c9ab733e8afbf7c25b (patch) | |
| tree | 75c00a32a8e305280cbec253195d1113d628fc3e /indra/newview/llfloaternamedesc.cpp | |
| parent | bc59c04653bf1404e8148a8169208b146a123b28 (diff) | |
svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into release
Diffstat (limited to 'indra/newview/llfloaternamedesc.cpp')
| -rw-r--r-- | indra/newview/llfloaternamedesc.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/newview/llfloaternamedesc.cpp b/indra/newview/llfloaternamedesc.cpp index 6b2562e73c..602a198a03 100644 --- a/indra/newview/llfloaternamedesc.cpp +++ b/indra/newview/llfloaternamedesc.cpp @@ -9,6 +9,8 @@ #include "llviewerprecompiledheaders.h" #include "llfloaternamedesc.h" + +// project includes #include "lllineeditor.h" #include "llresmgr.h" #include "lltextbox.h" @@ -16,13 +18,16 @@ #include "llviewerwindow.h" #include "llfocusmgr.h" #include "llradiogroup.h" -#include "llassetstorage.h" #include "lldbstrings.h" #include "lldir.h" #include "llviewercontrol.h" -#include "llviewermenu.h" +#include "llviewermenufile.h" // upload_new_resource() #include "llvieweruictrlfactory.h" +// linden includes +#include "llassetstorage.h" +#include "llinventorytype.h" + const S32 PREVIEW_LINE_HEIGHT = 19; const S32 PREVIEW_CLOSE_BOX_SIZE = 16; const S32 PREVIEW_BORDER_WIDTH = 2; |