diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 13:01:55 -0500 |
| commit | 3ef1a5a5d2334a0cd498e959b983e0cdf626eaef (patch) | |
| tree | a461ec6fc7412cff158635afffb0c4336fcac470 /indra/newview/llviewerobjectlist.h | |
| parent | 3c1cafeac1312ec37ba80853e1b04e5768c20738 (diff) | |
| parent | 3eba59e963d87f54e1b33b0a34de3fe37e67ebe1 (diff) | |
merge changes for beta fixes
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
| -rw-r--r-- | indra/newview/llviewerobjectlist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index 605bac8e89..fda3d6899d 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -160,7 +160,7 @@ public: const U32 ip, const U32 port); // Requires knowledge of message system info! - static BOOL removeFromLocalIDTable(const LLViewerObject &object); + static BOOL removeFromLocalIDTable(const LLViewerObject* objectp); // Used ONLY by the orphaned object code. static U64 getIndex(const U32 local_id, const U32 ip, const U32 port); |