diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-08-08 06:55:06 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-08-08 06:55:06 +0800 |
| commit | bfefc01a7baefa6377216ff236be6113c46fa879 (patch) | |
| tree | 58aac04fbb2251f032221178cd7f19e814e68567 /indra/newview/llvoavatar.cpp | |
| parent | 689b085fbafd49e8003874f3b318bac55fe248c3 (diff) | |
| parent | 9dee879a8b3b904f4332d3cacfe110615a217681 (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/newview/llvoavatar.cpp')
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index d7f6852c38..c6f8160c0d 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -819,7 +819,7 @@ LLVOAvatar::~LLVOAvatar() sInstances.remove(this); static LLCachedControl<bool> show_arrival_departures(gSavedSettings, "IMShowArrivalsDepartures", false); - if (show_arrival_departures) + if (show_arrival_departures && !isSelf()) { auto full_name = getFullname(); if (!full_name.empty()) @@ -2583,7 +2583,7 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys, mDebugExistenceTimer.reset(); debugAvatarRezTime("AvatarRezArrivedNotification", "avatar arrived"); static LLCachedControl<bool> show_arrival_departures(gSavedSettings, "IMShowArrivalsDepartures", false); - if (show_arrival_departures) + if (show_arrival_departures && !isSelf()) { auto full_name = getFullname(); if (!full_name.empty()) |