summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.h
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2010-07-21 14:14:42 +0300
committerVadim Savchuk <vsavchuk@productengine.com>2010-07-21 14:14:42 +0300
commit4a999fe04414f5489c555dbd609e7bae1c2667d6 (patch)
treec93505b07bbd7ca68ed7239655c42e7316b17ecd /indra/newview/llinventorymodel.h
parent52abfbbc4a3fbf55379fab861a1312eb5cecbc4d (diff)
parent842e5111ae2d0a83755ff902afa43dc84e45662b (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r--indra/newview/llinventorymodel.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h
index 7b56d0bdd1..ff8a5bae9b 100644
--- a/indra/newview/llinventorymodel.h
+++ b/indra/newview/llinventorymodel.h
@@ -41,6 +41,7 @@
#include "lluuid.h"
#include "llpermissionsflags.h"
#include "llstring.h"
+#include "llmd5.h"
#include <map>
#include <set>
#include <string>
@@ -194,6 +195,9 @@ public:
void getDirectDescendentsOf(const LLUUID& cat_id,
cat_array_t*& categories,
item_array_t*& items) const;
+
+ // Compute a hash of direct descendent names (for detecting child name changes)
+ LLMD5 hashDirectDescendentNames(const LLUUID& cat_id) const;
// Starting with the object specified, add its descendents to the
// array provided, but do not add the inventory object specified