aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterimagepreview.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloaterimagepreview.h
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterimagepreview.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterimagepreview.h b/linden/indra/newview/llfloaterimagepreview.h
index 8cf9b85..9d80f09 100644
--- a/linden/indra/newview/llfloaterimagepreview.h
+++ b/linden/indra/newview/llfloaterimagepreview.h
@@ -76,7 +76,7 @@ public:
76 LLImagePreviewAvatar(S32 width, S32 height); 76 LLImagePreviewAvatar(S32 width, S32 height);
77 virtual ~LLImagePreviewAvatar(); 77 virtual ~LLImagePreviewAvatar();
78 78
79 void setPreviewTarget(const char* joint_name, const char *mesh_name, LLImageRaw* imagep, F32 distance, BOOL male); 79 void setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, BOOL male);
80 void setTexture(U32 name) { mTextureName = name; } 80 void setTexture(U32 name) { mTextureName = name; }
81 81
82 BOOL render(); 82 BOOL render();
@@ -102,7 +102,7 @@ protected:
102class LLFloaterImagePreview : public LLFloaterNameDesc 102class LLFloaterImagePreview : public LLFloaterNameDesc
103{ 103{
104public: 104public:
105 LLFloaterImagePreview(const char* filename); 105 LLFloaterImagePreview(const std::string& filename);
106 virtual ~LLFloaterImagePreview(); 106 virtual ~LLFloaterImagePreview();
107 107
108 virtual BOOL postBuild(); 108 virtual BOOL postBuild();
@@ -118,7 +118,7 @@ public:
118protected: 118protected:
119 static void onPreviewTypeCommit(LLUICtrl*,void*); 119 static void onPreviewTypeCommit(LLUICtrl*,void*);
120 void draw(); 120 void draw();
121 bool loadImage(const char* filename); 121 bool loadImage(const std::string& filename);
122 122
123 LLPointer<LLImageRaw> mRawImagep; 123 LLPointer<LLImageRaw> mRawImagep;
124 LLImagePreviewAvatar* mAvatarPreview; 124 LLImagePreviewAvatar* mAvatarPreview;