summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.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/llinventorymodel.cpp
parentbbdd2a34d01d938226c7935a3d52ec0a7c483e90 (diff)
SH-4305 WIP
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rwxr-xr-xindra/newview/llinventorymodel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 82d58523ce..e1fd2e02fa 100755
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -472,7 +472,7 @@ class LLCreateInventoryCategoryResponder : public LLHTTPClient::Responder
LOG_CLASS(LLCreateInventoryCategoryResponder);
public:
LLCreateInventoryCategoryResponder(LLInventoryModel* model,
- boost::optional<llsd_func_type> callback):
+ boost::optional<inventory_func_type> callback):
mModel(model),
mCallback(callback)
{
@@ -511,12 +511,12 @@ protected:
if (mCallback)
{
- mCallback.get()(content);
+ mCallback.get()(category_id);
}
}
private:
- boost::optional<llsd_func_type> mCallback;
+ boost::optional<inventory_func_type> mCallback;
LLInventoryModel* mModel;
};
@@ -527,7 +527,7 @@ private:
LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
LLFolderType::EType preferred_type,
const std::string& pname,
- boost::optional<llsd_func_type> callback)
+ boost::optional<inventory_func_type> callback)
{
LLUUID id;