diff options
author | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
---|---|---|
committer | callum_linden <none@none> | 2017-08-22 14:32:04 -0700 |
commit | b5dbb9c52aa8f9379662f1ff1169adadcf8ac5f8 (patch) | |
tree | 438d099240df63608825568d162874e186835994 /indra/newview/llinventorymodel.h | |
parent | 8e6751efced8d9f5ede5ec5d954ff809d56d1162 (diff) | |
parent | 58176de9574164e31790a148d9b5489a129fc961 (diff) |
Automated merge with head of ll/viewer64 after DRTVWR-439 merge
Diffstat (limited to 'indra/newview/llinventorymodel.h')
-rw-r--r-- | indra/newview/llinventorymodel.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index c558c0803b..01e0ed7e9b 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -265,9 +265,6 @@ public: // Follow parent chain to the top. bool getObjectTopmostAncestor(const LLUUID& object_id, LLUUID& result) const; -private: - U32 getDescendentsCountRecursive(const LLUUID& id, U32 max_item_limit); - //-------------------------------------------------------------------- // Find //-------------------------------------------------------------------- |