diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
commit | fbc6e5d63970e081d7543f884fcc0fb897fce28e (patch) | |
tree | e722e908e0cc1f889be16a4815286172222dac6b /indra/newview/llviewerobjectlist.h | |
parent | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (diff) | |
parent | f0074f1002f36ad680ae04daf3f5e026dca31d54 (diff) |
Automated merge up from viewer-development into mesh-development
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 2c5f789eb1..7d0653b3b4 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -176,7 +176,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); |