diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-17 16:56:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-17 16:56:21 +0300 |
| commit | 0ef7a9b39cf72da1211039ab22bdf8f9f6a2c984 (patch) | |
| tree | 6f51ef179497265b5bff2a355471ae5dc9643ad2 /indra/newview/llteleporthistorystorage.cpp | |
| parent | 9e24b300d02e5627ea0d304d412cb683ec2de3a4 (diff) | |
| parent | d3d349ae0f17a72481f30b9354b9367b1cd3b639 (diff) | |
Merge pull request #2856 from secondlife/marchcat/c-develop
Develop → Maint C sync
Diffstat (limited to 'indra/newview/llteleporthistorystorage.cpp')
| -rw-r--r-- | indra/newview/llteleporthistorystorage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llteleporthistorystorage.cpp b/indra/newview/llteleporthistorystorage.cpp index 6a7ebaf8d6..e02f76711c 100644 --- a/indra/newview/llteleporthistorystorage.cpp +++ b/indra/newview/llteleporthistorystorage.cpp @@ -133,7 +133,7 @@ void LLTeleportHistoryStorage::addItem(const std::string title, const LLVector3d // Avoid it by preserving original position. item.mGlobalPos = item_iter->mGlobalPos; - removed_index = item_iter - mItems.begin(); + removed_index = (S32)(item_iter - mItems.begin()); mItems.erase(item_iter); } |