diff options
| author | William Weaver <paperwork.resident@gmail.com> | 2025-03-27 23:58:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-27 23:58:43 +0300 |
| commit | e18577274e393b177d18296f30ef730433a8ba1d (patch) | |
| tree | 0c31aa2d3e7b5b287d40a3d1293add79579d9f2e /indra/newview/llimview.h | |
| parent | 76db64e0c8c7dd40ce2a85ef19183c3c245f1dc8 (diff) | |
| parent | 571e33cd5905d62ce210aba5ac1cb1aca4d56de5 (diff) | |
Merge branch 'secondlife:develop' into fix/shadow-resolution-update
Diffstat (limited to 'indra/newview/llimview.h')
| -rw-r--r-- | indra/newview/llimview.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index 61776860e3..23f90ca795 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -368,7 +368,9 @@ public: const LLUUID& region_id = LLUUID::null, const LLVector3& position = LLVector3::zero, bool is_region_msg = false, - U32 timestamp = 0); + U32 timestamp = 0, + LLUUID display_id = LLUUID::null, + std::string_view display_name = ""); void addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args); |