diff options
Diffstat (limited to 'linden/indra/newview/llviewerpartsource.cpp')
-rw-r--r-- | linden/indra/newview/llviewerpartsource.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/linden/indra/newview/llviewerpartsource.cpp b/linden/indra/newview/llviewerpartsource.cpp index dcef8c2..efeca42 100644 --- a/linden/indra/newview/llviewerpartsource.cpp +++ b/linden/indra/newview/llviewerpartsource.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2003&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2003-2008, Linden Research, Inc. | 7 | * Copyright (c) 2003-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -33,6 +33,7 @@ | |||
33 | #include "llviewerpartsource.h" | 33 | #include "llviewerpartsource.h" |
34 | 34 | ||
35 | #include "llviewercontrol.h" | 35 | #include "llviewercontrol.h" |
36 | #include "llrender.h" | ||
36 | 37 | ||
37 | #include "llagent.h" | 38 | #include "llagent.h" |
38 | #include "lldrawable.h" | 39 | #include "lldrawable.h" |
@@ -69,7 +70,7 @@ void LLViewerPartSource::updatePart(LLViewerPart &part, const F32 dt) | |||
69 | { | 70 | { |
70 | } | 71 | } |
71 | 72 | ||
72 | void LLViewerPartSource::update(const F32 dt) | 73 | void LLViewerPartSource::update(const F32 dt) |
73 | { | 74 | { |
74 | llerrs << "Creating default part source!" << llendl; | 75 | llerrs << "Creating default part source!" << llendl; |
75 | } | 76 | } |
@@ -99,7 +100,7 @@ LLViewerPartSourceScript::LLViewerPartSourceScript(LLViewerObject *source_objp) | |||
99 | mSourceObjectp = source_objp; | 100 | mSourceObjectp = source_objp; |
100 | mPosAgent = mSourceObjectp->getPositionAgent(); | 101 | mPosAgent = mSourceObjectp->getPositionAgent(); |
101 | mImagep = gImageList.getImageFromFile("pixiesmall.j2c"); | 102 | mImagep = gImageList.getImageFromFile("pixiesmall.j2c"); |
102 | mImagep->bind(); | 103 | gGL.getTexUnit(0)->bind(mImagep.get()); |
103 | mImagep->setClamp(TRUE, TRUE); | 104 | mImagep->setClamp(TRUE, TRUE); |
104 | } | 105 | } |
105 | 106 | ||
@@ -282,6 +283,10 @@ void LLViewerPartSourceScript::update(const F32 dt) | |||
282 | 283 | ||
283 | part->init(this, mImagep, NULL); | 284 | part->init(this, mImagep, NULL); |
284 | part->mFlags = mPartSysData.mPartData.mFlags; | 285 | part->mFlags = mPartSysData.mPartData.mFlags; |
286 | if (!mSourceObjectp.isNull() && mSourceObjectp->isHUDAttachment()) | ||
287 | { | ||
288 | part->mFlags |= LLPartData::LL_PART_HUD; | ||
289 | } | ||
285 | part->mMaxAge = mPartSysData.mPartData.mMaxAge; | 290 | part->mMaxAge = mPartSysData.mPartData.mMaxAge; |
286 | part->mStartColor = mPartSysData.mPartData.mStartColor; | 291 | part->mStartColor = mPartSysData.mPartData.mStartColor; |
287 | part->mEndColor = mPartSysData.mPartData.mEndColor; | 292 | part->mEndColor = mPartSysData.mPartData.mEndColor; |