summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.h
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-09 09:56:52 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-09 09:56:52 -0800
commit1422be8312fcf19cbeecda8c109ea1e7b11eaa49 (patch)
tree7d78e1590126e849750755ab73f09edf8de9bc17 /indra/newview/llinventorymodel.h
parentc98bf3cd509dd7bf10837713a911f9932c476e1f (diff)
parent3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff)
Merge from viewer-development
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r--indra/newview/llinventorymodel.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 1740c4151d..6c60722c87 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -363,7 +363,9 @@ public:
// name based on type, pass in a NULL to the 'name' parameter.
LLUUID createNewCategory(const LLUUID& parent_id,
LLFolderType::EType preferred_type,
- const std::string& name);
+ const std::string& name,
+ void (*callback)(const LLSD&, void*) = NULL,
+ void* user_data = NULL );
protected:
// Internal methods that add inventory and make sure that all of
// the internal data structures are consistent. These methods