summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.h
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-01-09 10:05:07 -0800
committerTodd Stinson <stinson@lindenlab.com>2012-01-09 10:05:07 -0800
commit9ff4265baff19984096533f9dbd51ec255d9960c (patch)
tree1cce734a7f7ac04a0aaa248adc7aa9fcfb6bc687 /indra/newview/llinventorymodel.h
parent7236b1f4f8b3c14fe18af3d0bd5ee131ea7103dc (diff)
parent3dfb1536fa3bb85f6648a76591e80c3feea9eb83 (diff)
Pull and merge from https://bitbucket.org/lindenlab/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 340c1b0c22..0a564d353a 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -360,7 +360,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