diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-11-14 15:22:47 -0800 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-11-14 15:22:47 -0800 |
| commit | aa0115053aaa28de1c472410931c57b3e43b72a7 (patch) | |
| tree | 9a8ba45529cb125a2ae5cd4672b3fd093af9b45c /indra/newview/llviewerobjectlist.h | |
| parent | 4662ba8a2693780198d555a49a00cfafba838d41 (diff) | |
| parent | 1d022e86c84039f88c531e91ce857666acd224a1 (diff) | |
Merge
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 94c751acc6..72b2b99004 100644 --- a/indra/newview/llviewerobjectlist.h +++ b/indra/newview/llviewerobjectlist.h @@ -67,7 +67,7 @@ public: inline LLViewerObject *getObject(const S32 index); inline LLViewerObject *findObject(const LLUUID &id); - LLViewerObject *createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp); // Create a viewer-side object + LLViewerObject *createObjectViewer(const LLPCode pcode, LLViewerRegion *regionp, S32 flags = 0); // Create a viewer-side object LLViewerObject *createObjectFromCache(const LLPCode pcode, LLViewerRegion *regionp, const LLUUID &uuid, const U32 local_id); LLViewerObject *createObject(const LLPCode pcode, LLViewerRegion *regionp, const LLUUID &uuid, const U32 local_id, const LLHost &sender); |