summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-04-28 14:14:06 -0400
committerLoren Shih <seraph@lindenlab.com>2010-04-28 14:14:06 -0400
commitec36c092a2a5995983a2dc97662c4de3e408ead4 (patch)
tree323f8e7b42cf10f4ac387963869fa64557376c74
parent29e1804139691229a887144b612f147e1c9dcffb (diff)
Compile error fix for missing description field in link_inventory_item.
-rw-r--r--indra/newview/llinventorybridge.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 9275ddc4e3..c6f806178c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1835,11 +1835,13 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
else
{
LLPointer<LLInventoryCallback> cb = NULL;
+ const std::string empty_description = "";
link_inventory_item(
gAgent.getID(),
inv_cat->getUUID(),
mUUID,
inv_cat->getName(),
+ empty_description,
LLAssetType::AT_LINK_FOLDER,
cb);
}
@@ -2510,11 +2512,13 @@ void LLFolderBridge::pasteLinkFromClipboard()
const LLUUID &object_id = (*iter);
if (LLInventoryCategory *cat = model->getCategory(object_id))
{
+ const std::string empty_description = "";
link_inventory_item(
gAgent.getID(),
cat->getUUID(),
parent_id,
cat->getName(),
+ empty_description,
LLAssetType::AT_LINK_FOLDER,
LLPointer<LLInventoryCallback>(NULL));
}
@@ -2525,7 +2529,7 @@ void LLFolderBridge::pasteLinkFromClipboard()
item->getLinkedUUID(),
parent_id,
item->getName(),
- item->getDescription(),
+ item->getDescription(),
LLAssetType::AT_LINK,
LLPointer<LLInventoryCallback>(NULL));
}