aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llalertdialog.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/llui/llalertdialog.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/linden/indra/llui/llalertdialog.h b/linden/indra/llui/llalertdialog.h
index 016a4b4..31f4769 100644
--- a/linden/indra/llui/llalertdialog.h
+++ b/linden/indra/llui/llalertdialog.h
@@ -12,12 +12,12 @@
12 * ("GPL"), unless you have obtained a separate licensing agreement 12 * ("GPL"), unless you have obtained a separate licensing agreement
13 * ("Other License"), formally executed by you and Linden Lab. Terms of 13 * ("Other License"), formally executed by you and Linden Lab. Terms of
14 * the GPL can be found in doc/GPL-license.txt in this distribution, or 14 * the GPL can be found in doc/GPL-license.txt in this distribution, or
15 * online at http://secondlife.com/developers/opensource/gplv2 15 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
16 * 16 *
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlife.com/developers/opensource/flossexception 20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 21 *
22 * By copying, modifying or distributing this software, you acknowledge 22 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 23 * that you have read and understood your obligations described above,
@@ -78,6 +78,7 @@ public:
78 78
79 bool setCheckBox( const LLString&, const LLString& ); 79 bool setCheckBox( const LLString&, const LLString& );
80 void setOptionEnabled( S32 option, BOOL enable ); 80 void setOptionEnabled( S32 option, BOOL enable );
81 void setCaution(BOOL val = TRUE) { mCaution = val; }
81 // If mUnique==TRUE only one copy of this message should exist 82 // If mUnique==TRUE only one copy of this message should exist
82 void setUnique(BOOL val = TRUE) { mUnique = val; } 83 void setUnique(BOOL val = TRUE) { mUnique = val; }
83 void setEditTextCallback(alert_text_callback_t callback, void *user_data); 84 void setEditTextCallback(alert_text_callback_t callback, void *user_data);
@@ -129,6 +130,7 @@ protected:
129 S32 mDefaultOption; 130 S32 mDefaultOption;
130 BOOL mOptionChosen; 131 BOOL mOptionChosen;
131 LLCheckBoxCtrl* mCheck; 132 LLCheckBoxCtrl* mCheck;
133 BOOL mCaution;
132 BOOL mUnique; 134 BOOL mUnique;
133 S32 mIgnorable; 135 S32 mIgnorable;
134 LLString mLabel; 136 LLString mLabel;
@@ -163,7 +165,7 @@ private:
163class LLAlertDialogTemplate : public LLRefCount 165class LLAlertDialogTemplate : public LLRefCount
164{ 166{
165public: 167public:
166 LLAlertDialogTemplate() : mTitle(), mURLOption(0), mModal(FALSE), mUnique(FALSE), mIgnorable(0), mDefaultOption(0) {} 168 LLAlertDialogTemplate() : mTitle(), mURLOption(0), mModal(FALSE), mCaution(FALSE), mUnique(FALSE), mIgnorable(0), mDefaultOption(0) {}
167 169
168 void addOption(const LLString& label, const LLString& ignore_text, BOOL is_default = FALSE) 170 void addOption(const LLString& label, const LLString& ignore_text, BOOL is_default = FALSE)
169 { 171 {
@@ -205,6 +207,7 @@ public:
205 LLString mURL; // Some alerts will direct the resident to a URL 207 LLString mURL; // Some alerts will direct the resident to a URL
206 S32 mURLOption; 208 S32 mURLOption;
207 BOOL mModal; 209 BOOL mModal;
210 BOOL mCaution;
208 BOOL mUnique; 211 BOOL mUnique;
209 S32 mIgnorable; // 0 = Never Ignore, 1 = Do default option, 2 = Do saved option 212 S32 mIgnorable; // 0 = Never Ignore, 1 = Do default option, 2 = Do saved option
210 std::vector<LLString> mOptions; 213 std::vector<LLString> mOptions;