diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
commit | e1c5abce9309a89bd9993264bca8dadadf882c6f (patch) | |
tree | 81e1f91811b207abd4dfe4c82db31583d92df212 /indra/newview/llpanelcontents.cpp | |
parent | 33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff) | |
parent | 0bd2567bf5648808a95c7826581199bb371597cb (diff) |
merge with remote repo
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, |