aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:37 -0500
committerJacek Antonelli2008-08-15 23:45:37 -0500
commit31ba05810c641f14e8ab5da8ad2aaf527779f6c1 (patch)
treec4b8d635dfb657fa4cfee7c285f8cadbf24afa90 /linden/indra/newview/llviewerobject.h
parentSecond Life viewer sources 1.19.1.1 (diff)
downloadmeta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.zip
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.gz
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.bz2
meta-impy-31ba05810c641f14e8ab5da8ad2aaf527779f6c1.tar.xz
Second Life viewer sources 1.19.1.2
Diffstat (limited to 'linden/indra/newview/llviewerobject.h')
-rw-r--r--linden/indra/newview/llviewerobject.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 798edf8..329ef6a 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -280,6 +280,7 @@ public:
280 /*virtual*/ void setTE(const U8 te, const LLTextureEntry &texture_entry); 280 /*virtual*/ void setTE(const U8 te, const LLTextureEntry &texture_entry);
281 /*virtual*/ S32 setTETexture(const U8 te, const LLUUID &uuid); 281 /*virtual*/ S32 setTETexture(const U8 te, const LLUUID &uuid);
282 S32 setTETextureCore(const U8 te, const LLUUID& uuid, LLHost host); 282 S32 setTETextureCore(const U8 te, const LLUUID& uuid, LLHost host);
283 /*virtual*/ S32 setTEColor(const U8 te, const LLColor3 &color);
283 /*virtual*/ S32 setTEColor(const U8 te, const LLColor4 &color); 284 /*virtual*/ S32 setTEColor(const U8 te, const LLColor4 &color);
284 /*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t); 285 /*virtual*/ S32 setTEScale(const U8 te, const F32 s, const F32 t);
285 /*virtual*/ S32 setTEScaleS(const U8 te, const F32 s); 286 /*virtual*/ S32 setTEScaleS(const U8 te, const F32 s);
@@ -453,7 +454,7 @@ public:
453 virtual S32 getLOD() const { return 3; } 454 virtual S32 getLOD() const { return 3; }
454 virtual U32 getPartitionType() const; 455 virtual U32 getPartitionType() const;
455 virtual void dirtySpatialGroup() const; 456 virtual void dirtySpatialGroup() const;
456 virtual void dirtyMesh() const; 457 virtual void dirtyMesh();
457 458
458 virtual LLNetworkData* getParameterEntry(U16 param_type) const; 459 virtual LLNetworkData* getParameterEntry(U16 param_type) const;
459 virtual bool setParameterEntry(U16 param_type, const LLNetworkData& new_value, bool local_origin); 460 virtual bool setParameterEntry(U16 param_type, const LLNetworkData& new_value, bool local_origin);