diff options
author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
commit | b4c36af1419c980fd6be032b44033852d036a790 (patch) | |
tree | c3ec2084584eec2203b6661d6cca4650b100300e /indra/newview/llviewerobjectlist.h | |
parent | ff0e3e6177812cdb6b3e044500d50f5d8d10434a (diff) | |
parent | 92eadc18f3ea3538c36518f7060b4b78a80bc0d7 (diff) |
merge changes for storm-547
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); |