diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
| commit | fa3b57bd9f0afcf2d38dae27d4b9765624baf758 (patch) | |
| tree | ff083f4e4eec5d6d4e9191f34cae6450e0a318ac /indra/newview/llpanelcontents.cpp | |
| parent | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (diff) | |
| parent | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (diff) | |
Merge the work lost in 49c9461937df back into the tree
Diffstat (limited to 'indra/newview/llpanelcontents.cpp')
| -rw-r--r-- | indra/newview/llpanelcontents.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelcontents.cpp b/indra/newview/llpanelcontents.cpp index c28792a711..9d591ef43d 100644 --- a/indra/newview/llpanelcontents.cpp +++ b/indra/newview/llpanelcontents.cpp @@ -59,6 +59,7 @@ #include "lltoolcomp.h" #include "lltoolmgr.h" #include "lltrans.h" +#include "llviewerassettype.h" #include "llviewerobject.h" #include "llviewerregion.h" #include "llviewerwindow.h" @@ -167,7 +168,7 @@ void LLPanelContents::onClickNewScript(void *userdata) PERM_NONE, PERM_MOVE | PERM_TRANSFER); std::string desc; - LLAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc); + LLViewerAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc); LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem( LLUUID::null, |