aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateranimpreview.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/llfloateranimpreview.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 'linden/indra/newview/llfloateranimpreview.h')
-rw-r--r--linden/indra/newview/llfloateranimpreview.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index 99b66d7..b7bb521 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -70,7 +70,7 @@ protected:
70class LLFloaterAnimPreview : public LLFloaterNameDesc 70class LLFloaterAnimPreview : public LLFloaterNameDesc
71{ 71{
72public: 72public:
73 LLFloaterAnimPreview(const char* filename); 73 LLFloaterAnimPreview(const std::string& filename);
74 virtual ~LLFloaterAnimPreview(); 74 virtual ~LLFloaterAnimPreview();
75 75
76 BOOL postBuild(); 76 BOOL postBuild();
@@ -125,7 +125,7 @@ protected:
125 BOOL mEnabled; 125 BOOL mEnabled;
126 LLAnimPauseRequest mPauseRequest; 126 LLAnimPauseRequest mPauseRequest;
127 127
128 std::map<LLString, LLUUID> mIDList; 128 std::map<std::string, LLUUID> mIDList;
129 129
130 static S32 sUploadAmount; 130 static S32 sUploadAmount;
131}; 131};