diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-10-04 11:27:59 -0700 |
| commit | 98a89748789034a53f129e19d06649d79b384c52 (patch) | |
| tree | 39a1aefb35402db02c8791bc3e5735c36116f426 /indra/newview/llviewerobject.h | |
| parent | 796be733b374beb5660ee2713fc28c4e69331cbd (diff) | |
| parent | 1e32b9dd33fb9e2f0d9a7935a3696b423a191354 (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/llviewerobject.h')
| -rwxr-xr-x | indra/newview/llviewerobject.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 16f1f403d3..b035473c74 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -339,7 +339,7 @@ public: LLViewerTexture *getTENormalMap(const U8 te) const; LLViewerTexture *getTESpecularMap(const U8 te) const; - bool isImageAlphaBlended(const U8 te) const; + bool isImageAlphaBlended(const U8 te) const; void fitFaceTexture(const U8 face); void sendTEUpdate() const; // Sends packed representation of all texture entry information @@ -602,6 +602,7 @@ public: } EPhysicsShapeType; LLUUID mID; + LLUUID mOwnerID; //null if unknown // unique within region, not unique across regions // Local ID = 0 is not used @@ -682,7 +683,7 @@ protected: BOOL isOnMap(); void unpackParticleSource(const S32 block_num, const LLUUID& owner_id); - void unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_id); + void unpackParticleSource(LLDataPacker &dp, const LLUUID& owner_id, bool legacy); void deleteParticleSource(); void setParticleSource(const LLPartSysData& particle_parameters, const LLUUID& owner_id); @@ -847,8 +848,11 @@ public: LLStrider<LLVector3>& normalsp, LLStrider<LLVector2>& texcoordsp, LLStrider<LLColor4U>& colorsp, + LLStrider<LLColor4U>& emissivep, LLStrider<U16>& indicesp) = 0; + virtual void getBlendFunc(S32 face, U32& src, U32& dst); + F32 mDepth; }; |