diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:03:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:03:16 +0100 |
| commit | 9fbe736774b1049265fd017bfe2413d436d35706 (patch) | |
| tree | 2077c5ced76eed3d14c3340a9645306e99434bbb /indra/newview/lltoolmorph.cpp | |
| parent | 103083b52def07c140dfc8f28989b5f4a93d288a (diff) | |
| parent | 0a80627bca63ee05ce07df510ebe2072399dd01d (diff) | |
(slightly hairy) merge from viewer-hotfix
Diffstat (limited to 'indra/newview/lltoolmorph.cpp')
| -rw-r--r-- | indra/newview/lltoolmorph.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index 969049ee65..22176c037f 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -108,6 +108,12 @@ LLVisualParamHint::~LLVisualParamHint() LLVisualParamHint::sInstances.erase( this ); } +//virtual +S8 LLVisualParamHint::getType() const +{ + return LLViewerDynamicTexture::LL_VISUAL_PARAM_HINT ; +} + //----------------------------------------------------------------------------- // static // requestHintUpdates() @@ -287,6 +293,12 @@ LLVisualParamReset::LLVisualParamReset() : LLViewerDynamicTexture(1, 1, 1, ORDER { } +//virtual +S8 LLVisualParamReset::getType() const +{ + return LLViewerDynamicTexture::LL_VISUAL_PARAM_RESET ; +} + //----------------------------------------------------------------------------- // render() //----------------------------------------------------------------------------- |