Skip to content
Snippets Groups Projects
Commit ec36c092 authored by Loren Shih's avatar Loren Shih
Browse files

Compile error fix for missing description field in link_inventory_item.

parent 29e18041
Branches
Tags
No related merge requests found
...@@ -1835,11 +1835,13 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, ...@@ -1835,11 +1835,13 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
else else
{ {
LLPointer<LLInventoryCallback> cb = NULL; LLPointer<LLInventoryCallback> cb = NULL;
const std::string empty_description = "";
link_inventory_item( link_inventory_item(
gAgent.getID(), gAgent.getID(),
inv_cat->getUUID(), inv_cat->getUUID(),
mUUID, mUUID,
inv_cat->getName(), inv_cat->getName(),
empty_description,
LLAssetType::AT_LINK_FOLDER, LLAssetType::AT_LINK_FOLDER,
cb); cb);
} }
...@@ -2510,11 +2512,13 @@ void LLFolderBridge::pasteLinkFromClipboard() ...@@ -2510,11 +2512,13 @@ void LLFolderBridge::pasteLinkFromClipboard()
const LLUUID &object_id = (*iter); const LLUUID &object_id = (*iter);
if (LLInventoryCategory *cat = model->getCategory(object_id)) if (LLInventoryCategory *cat = model->getCategory(object_id))
{ {
const std::string empty_description = "";
link_inventory_item( link_inventory_item(
gAgent.getID(), gAgent.getID(),
cat->getUUID(), cat->getUUID(),
parent_id, parent_id,
cat->getName(), cat->getName(),
empty_description,
LLAssetType::AT_LINK_FOLDER, LLAssetType::AT_LINK_FOLDER,
LLPointer<LLInventoryCallback>(NULL)); LLPointer<LLInventoryCallback>(NULL));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment