diff options
author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-03-01 16:37:59 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-03-01 16:37:59 -0500 |
commit | 5d78ff48cb1f916180a2ffd10989eae50b81b4ec (patch) | |
tree | eb1f22ba21082efbb023b1b85468ed7923d519fb /indra/newview/llviewerobjectlist.h | |
parent | 5aa359ed8d4d36e45c562cf56cb69580dc4236b4 (diff) | |
parent | 42ceac9695f7e098f15264977396a939c8ddfd23 (diff) |
Merge pull request #3634 from secondlife/release/2024.12-ForeverFPS
Update develop with ForeverFPS
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r-- | indra/newview/llviewerobjectlist.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index dc31995eb1..547ef9fb2d 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -179,9 +179,10 @@ public: void setUUIDAndLocal(const LLUUID &id, const U32 local_id, const U32 ip, - const U32 port); // Requires knowledge of message system info! + const U32 port, + LLViewerObject* objectp); // Requires knowledge of message system info! - bool removeFromLocalIDTable(const LLViewerObject* objectp); + bool removeFromLocalIDTable(LLViewerObject* objectp); // Used ONLY by the orphaned object code. U64 getIndex(const U32 local_id, const U32 ip, const U32 port); |