aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelcontents.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llpanelcontents.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llpanelcontents.cpp')
-rw-r--r--linden/indra/newview/llpanelcontents.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index be4d9db..4d6508a 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -168,7 +168,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
168 PERM_NONE, 168 PERM_NONE,
169 PERM_NONE, 169 PERM_NONE,
170 PERM_MOVE | PERM_TRANSFER); 170 PERM_MOVE | PERM_TRANSFER);
171 LLString desc; 171 std::string desc;
172 LLAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc); 172 LLAssetType::generateDescriptionFor(LLAssetType::AT_LSL_TEXT, desc);
173 LLPointer<LLViewerInventoryItem> new_item = 173 LLPointer<LLViewerInventoryItem> new_item =
174 new LLViewerInventoryItem( 174 new LLViewerInventoryItem(
@@ -178,7 +178,7 @@ void LLPanelContents::onClickNewScript(void *userdata)
178 LLUUID::null, 178 LLUUID::null,
179 LLAssetType::AT_LSL_TEXT, 179 LLAssetType::AT_LSL_TEXT,
180 LLInventoryType::IT_LSL, 180 LLInventoryType::IT_LSL,
181 LLString("New Script"), 181 std::string("New Script"),
182 desc, 182 desc,
183 LLSaleInfo::DEFAULT, 183 LLSaleInfo::DEFAULT,
184 LLViewerInventoryItem::II_FLAGS_NONE, 184 LLViewerInventoryItem::II_FLAGS_NONE,