diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 06:28:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-25 06:28:16 +0100 |
| commit | 928806e0926253ef0cea5d7aab2c6d0af132462c (patch) | |
| tree | e64599377021d33760a651721adaf230780aa1e0 /indra/newview/llwearable.h | |
| parent | cb20504bf09de1e6e7f2f1987b442dc3e67826b2 (diff) | |
| parent | 2a99af8d949b982ea5832735c61ca249554f5b02 (diff) | |
merge from viewer-public
Diffstat (limited to 'indra/newview/llwearable.h')
| -rw-r--r-- | indra/newview/llwearable.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llwearable.h b/indra/newview/llwearable.h index 458415228f..6b6067fd27 100644 --- a/indra/newview/llwearable.h +++ b/indra/newview/llwearable.h @@ -81,7 +81,6 @@ public: const std::string& getTypeLabel() const; const std::string& getTypeName() const; LLAssetType::EType getAssetType() const; - LLLocalTextureObject* getLocalTextureObject(S32 index) const; S32 getDefinitionVersion() const { return mDefinitionVersion; } void setDefinitionVersion( S32 new_version ) { mDefinitionVersion = new_version; } @@ -112,7 +111,7 @@ public: void setItemID(const LLUUID& item_id); LLLocalTextureObject* getLocalTextureObject(S32 index); - const LLLocalTextureObject* getConstLocalTextureObject(S32 index) const; + const LLLocalTextureObject* getLocalTextureObject(S32 index) const; void setLocalTextureObject(S32 index, LLLocalTextureObject <o); void addVisualParam(LLVisualParam *param); |