diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-04-14 12:12:03 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-04-14 12:12:03 -0500 |
| commit | a7e1745bed2e8c22843b946700b4ae9c8fbf8ac9 (patch) | |
| tree | 40d0b8bc9c5715f55e2870c5e2e4b534e01a774b /indra/newview/llfloaterimagepreview.cpp | |
| parent | 6b72149cf7ad90c0036d9b037594b0a8e86dc483 (diff) | |
| parent | 168ef83bcfae2a03c385a91a70e12a6fc773e3c5 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterimagepreview.cpp')
| -rw-r--r-- | indra/newview/llfloaterimagepreview.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp index 6b754bd065..ef9da30552 100644 --- a/indra/newview/llfloaterimagepreview.cpp +++ b/indra/newview/llfloaterimagepreview.cpp @@ -629,6 +629,11 @@ LLImagePreviewAvatar::~LLImagePreviewAvatar() mDummyAvatar->markDead(); } +//virtual +S8 LLImagePreviewAvatar::getType() const +{ + return LLViewerDynamicTexture::LL_IMAGE_PREVIEW_AVATAR ; +} void LLImagePreviewAvatar::setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, BOOL male) { @@ -808,6 +813,11 @@ LLImagePreviewSculpted::~LLImagePreviewSculpted() { } +//virtual +S8 LLImagePreviewSculpted::getType() const +{ + return LLViewerDynamicTexture::LL_IMAGE_PREVIEW_SCULPTED ; +} void LLImagePreviewSculpted::setPreviewTarget(LLImageRaw* imagep, F32 distance) { |