diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-24 18:02:16 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-24 18:02:16 +0300 |
| commit | 168a5f36b92f5cbc3d83248fb5ffbb47a3b7e223 (patch) | |
| tree | 22074ffb1c262b9ffbb458a2836405e5c086ce7d /indra/newview/llimview.cpp | |
| parent | cbee7ee274aec9b8b9e0ccaaffa8b76e90a02f16 (diff) | |
| parent | 299c37adaec5cf33981cbbaa3c25c68152b14725 (diff) | |
Merge branch 'develop' into marchcat/xcode-16
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1402cc8c37..8a54267292 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -3143,7 +3143,7 @@ void LLIMMgr::addMessage( const LLUUID& region_id, const LLVector3& position, bool is_region_msg, - U32 timestamp) // May be zero + U32 timestamp) // May be zero { LLUUID other_participant_id = target_id; |