diff options
| author | nat-goodspeed <nat@lindenlab.com> | 2024-09-24 07:28:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-24 07:28:44 -0400 |
| commit | 1175288a3c685310dbbf7fdd46d7deae0b0bf92d (patch) | |
| tree | 84fd4d186169807c4da1c0c352d9be92f1e63227 /indra/llui/llmenugl.cpp | |
| parent | 0ee1106faccf90c883d8b9ffc522a341659742ed (diff) | |
| parent | 9036e4582cec1893016bd692293ec1c0135f7112 (diff) | |
Merge pull request #2534 from secondlife/release/luau-scripting
Add Lua scripting to develop, behind feature flag
Diffstat (limited to 'indra/llui/llmenugl.cpp')
| -rw-r--r-- | indra/llui/llmenugl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 69ffa9a94f..cc770ca90a 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -2625,7 +2625,9 @@ void LLMenuGL::insert( S32 position, LLView * ctrl, bool arrange /*= true*/ ) { LLMenuItemGL * item = dynamic_cast<LLMenuItemGL *>(ctrl); - if (NULL == item || position < 0 || position >= mItems.size()) + // If position == size(), std::advance() will return end() -- which is + // okay, because insert(end()) is the same as append(). + if (NULL == item || position < 0 || position > mItems.size()) { return; } |