summaryrefslogtreecommitdiff
path: root/indra/newview/llfloateropenobject.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2013-06-25 17:52:02 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2013-06-25 17:52:02 -0400
commitffd7b0d7e7ef13510d7299e601a71c7fedb0a4d1 (patch)
tree73061ba3468d4ac92a02986f9e1c3da021b58a47 /indra/newview/llfloateropenobject.cpp
parentbbdd2a34d01d938226c7935a3d52ec0a7c483e90 (diff)
SH-4305 WIP
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
-rwxr-xr-xindra/newview/llfloateropenobject.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp
index 1c086976ba..9986bdbd7f 100755
--- a/indra/newview/llfloateropenobject.cpp
+++ b/indra/newview/llfloateropenobject.cpp
@@ -163,7 +163,7 @@ void LLFloaterOpenObject::moveToInventory(bool wear)
parent_category_id = gInventory.getRootFolderID();
}
- llsd_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear);
+ inventory_func_type func = boost::bind(LLFloaterOpenObject::callbackCreateInventoryCategory,_1,object_id,wear);
LLUUID category_id = gInventory.createNewCategory(parent_category_id,
LLFolderType::FT_NONE,
name,
@@ -194,10 +194,9 @@ void LLFloaterOpenObject::moveToInventory(bool wear)
}
// static
-void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLSD& result, LLUUID object_id, bool wear)
+void LLFloaterOpenObject::callbackCreateInventoryCategory(const LLUUID& category_id, LLUUID object_id, bool wear)
{
LLCatAndWear* wear_data = new LLCatAndWear;
- LLUUID category_id = result["folder_id"].asUUID();
wear_data->mCatID = category_id;
wear_data->mWear = wear;