diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llnotify.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp index 3c3f824..da0029a 100644 --- a/linden/indra/newview/llnotify.cpp +++ b/linden/indra/newview/llnotify.cpp | |||
@@ -297,12 +297,12 @@ LLNotifyBox::LLNotifyBox(LLNotificationPtr notification, | |||
297 | continue; | 297 | continue; |
298 | } | 298 | } |
299 | 299 | ||
300 | addButton(form_element["name"].asString(), TRUE, form_element["default"].asBoolean()); | 300 | addButton(form_element["name"].asString(), form_element["text"].asString(), TRUE, form_element["default"].asBoolean()); |
301 | } | 301 | } |
302 | 302 | ||
303 | if (mNumButtons == 0) | 303 | if (mNumButtons == 0) |
304 | { | 304 | { |
305 | addButton("OK", FALSE, TRUE); | 305 | addButton("OK", "OK", FALSE, TRUE); |
306 | mAddedDefaultBtn = TRUE; | 306 | mAddedDefaultBtn = TRUE; |
307 | } | 307 | } |
308 | 308 | ||
@@ -324,7 +324,7 @@ LLNotifyBox::~LLNotifyBox() | |||
324 | } | 324 | } |
325 | 325 | ||
326 | // virtual | 326 | // virtual |
327 | LLButton* LLNotifyBox::addButton(const std::string& name, BOOL is_option, BOOL is_default) | 327 | LLButton* LLNotifyBox::addButton(const std::string& name, const std::string& label, BOOL is_option, BOOL is_default) |
328 | { | 328 | { |
329 | // make caution notification buttons slightly narrower | 329 | // make caution notification buttons slightly narrower |
330 | // so that 3 of them can fit without overlapping the "next" button | 330 | // so that 3 of them can fit without overlapping the "next" button |
@@ -365,6 +365,7 @@ LLButton* LLNotifyBox::addButton(const std::string& name, BOOL is_option, BOOL i | |||
365 | 365 | ||
366 | 366 | ||
367 | btn = new LLButton(name, btn_rect, "", onClickButton, userdata); | 367 | btn = new LLButton(name, btn_rect, "", onClickButton, userdata); |
368 | btn->setLabel(label); | ||
368 | btn->setFont(font); | 369 | btn->setFont(font); |
369 | 370 | ||
370 | if (mIsCaution) | 371 | if (mIsCaution) |