aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llprogressview.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llprogressview.h')
-rw-r--r--linden/indra/newview/llprogressview.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llprogressview.h b/linden/indra/newview/llprogressview.h
index 853bab7..8ea3dfb 100644
--- a/linden/indra/newview/llprogressview.h
+++ b/linden/indra/newview/llprogressview.h
@@ -52,20 +52,20 @@ public:
52 /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask); 52 /*virtual*/ BOOL handleKeyHere(KEY key, MASK mask);
53 /*virtual*/ void setVisible(BOOL visible); 53 /*virtual*/ void setVisible(BOOL visible);
54 54
55 void setText(const LLString& text); 55 void setText(const std::string& text);
56 void setPercent(const F32 percent); 56 void setPercent(const F32 percent);
57 57
58 // Set it to NULL when you want to eliminate the message. 58 // Set it to NULL when you want to eliminate the message.
59 void setMessage(const LLString& msg); 59 void setMessage(const std::string& msg);
60 60
61 void setCancelButtonVisible(BOOL b, const LLString& label); 61 void setCancelButtonVisible(BOOL b, const std::string& label);
62 62
63 static void onCancelButtonClicked( void* ); 63 static void onCancelButtonClicked( void* );
64 64
65protected: 65protected:
66 F32 mPercentDone; 66 F32 mPercentDone;
67 LLString mText; 67 std::string mText;
68 LLString mMessage; 68 std::string mMessage;
69 LLButton* mCancelBtn; 69 LLButton* mCancelBtn;
70 LLFrameTimer mFadeTimer; 70 LLFrameTimer mFadeTimer;
71 LLFrameTimer mProgressTimer; 71 LLFrameTimer mProgressTimer;