diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-02-12 17:13:55 -0500 |
commit | 2cabf100e22d4f54ebd0ea6ea20b88985a5654c4 (patch) | |
tree | a410a41598caf63aeef39b2d0c40741ac372c10f /indra/newview/llviewerobjectlist.h | |
parent | dce57c6b80b1286889da1a6cadda05c864a31851 (diff) | |
parent | 21be0916a4b707654e99a8c6c734d24e4bb5da7c (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llviewerobjectlist.h')
-rw-r--r-- | indra/newview/llviewerobjectlist.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewerobjectlist.h b/indra/newview/llviewerobjectlist.h index ace5c5038e..2858081dc9 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -233,6 +233,10 @@ public: extern LLViewerObjectList gObjectList; // Inlines +/** + * Note: + * it will return NULL for offline avatar_id + */ inline LLViewerObject *LLViewerObjectList::findObject(const LLUUID &id) { std::map<LLUUID, LLPointer<LLViewerObject> >::iterator iter = mUUIDObjectMap.find(id); |