diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:57:07 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-12 11:57:07 +0100 |
| commit | c330e26db8b2a3a3fef9eed6225594323090cdb9 (patch) | |
| tree | 1658cafc671065730ca7380cda375c801013c614 /indra/newview/llfloaterimagepreview.h | |
| parent | 49b1995d27e65f1836224c80f3980e133441b0c8 (diff) | |
| parent | d6996c7d3da4ddbb81a7758e508c1aa477d4edc4 (diff) | |
slightly conflicty merge from viewer-trunk, again
Diffstat (limited to 'indra/newview/llfloaterimagepreview.h')
| -rw-r--r-- | indra/newview/llfloaterimagepreview.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h index 4a12543650..466bd1d0ec 100644 --- a/indra/newview/llfloaterimagepreview.h +++ b/indra/newview/llfloaterimagepreview.h @@ -54,6 +54,8 @@ protected: public: LLImagePreviewSculpted(S32 width, S32 height); + /*virtual*/ S8 getType() const ; + void setPreviewTarget(LLImageRaw *imagep, F32 distance); void setTexture(U32 name) { mTextureName = name; } @@ -85,6 +87,8 @@ protected: public: LLImagePreviewAvatar(S32 width, S32 height); + /*virtual*/ S8 getType() const ; + void setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, BOOL male); void setTexture(U32 name) { mTextureName = name; } void clearPreviewTexture(const std::string& mesh_name); |