summaryrefslogtreecommitdiff
path: root/indra/llcommon/llkeybind.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@mbp.localdomain>2023-01-26 10:37:59 -0800
committerCallum Prentice <callum@mbp.localdomain>2023-01-26 10:37:59 -0800
commitfb00bce81ad201b5f1798ff5d5afe8c4dcabda54 (patch)
treea157a9f0ec2648cf7d2281a8019b52b8468111f9 /indra/llcommon/llkeybind.h
parent66f59478d09122ddf43c4ba3445754d1698bf016 (diff)
parentf3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff)
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/llcommon/llkeybind.h')
-rw-r--r--indra/llcommon/llkeybind.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcommon/llkeybind.h b/indra/llcommon/llkeybind.h
index c6b4bd970f..488f509411 100644
--- a/indra/llcommon/llkeybind.h
+++ b/indra/llcommon/llkeybind.h
@@ -95,11 +95,13 @@ public:
void clear() { mData.clear(); }
// if there any empty LLKeyData in the end of the array, remove them
void trimEmpty();
- U32 getDataCount();
+ size_t getDataCount();
private:
typedef std::vector<LLKeyData> data_vector_t;
data_vector_t mData;
+
+ data_vector_t::const_iterator endNonEmpty() const;
};