diff options
| author | angela <angela@lindenlab.com> | 2009-11-04 12:33:52 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-04 12:33:52 +0800 |
| commit | 61603ca9d55c76219093cb7000e7f75e539bf5fe (patch) | |
| tree | b1528b99061758e0f7b8fdaaa8754c2169036d89 /indra/newview/llpanelcontents.cpp | |
| parent | 1190b5d9eb6f1e1d698430957b99872abd354f81 (diff) | |
| parent | 6e9fe077277b50634b125084f52da55fa8cb84d9 (diff) | |
mergre
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
| -rw-r--r-- | indra/newview/llpanelcontents.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index 9d591ef43d..c28792a711 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -59,7 +59,6 @@ #include "lltoolcomp.h" #include "lltoolmgr.h" #include "lltrans.h" -#include "llviewerassettype.h" #include "llviewerobject.h" #include "llviewerregion.h" #include "llviewerwindow.h" @@ -168,7 +167,7 @@ void LLPanelContents::onClickNewScript(void *userdata) PERM_NONE, PERM_MOVE | PERM_TRANSFER); std::string desc; - LLViewerAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc); + LLAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc); LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem( LLUUID::null, |