diff options
author | Jacek Antonelli | 2009-04-30 13:04:20 -0500 |
---|---|---|
committer | Jacek Antonelli | 2009-04-30 13:07:16 -0500 |
commit | ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e (patch) | |
tree | 8348301d0ac44a524f1819b777686bf086907d76 /linden/indra/newview/llpanelevent.cpp | |
parent | Second Life viewer sources 1.22.11 (diff) | |
download | meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.zip meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.gz meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.bz2 meta-impy-ca8149ca6d157eb4b5fc8ba0e5ba3a6e56f72e7e.tar.xz |
Second Life viewer sources 1.23.0-RC
Diffstat (limited to 'linden/indra/newview/llpanelevent.cpp')
-rw-r--r-- | linden/indra/newview/llpanelevent.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/linden/indra/newview/llpanelevent.cpp b/linden/indra/newview/llpanelevent.cpp index 830cb1d..c8c49a8 100644 --- a/linden/indra/newview/llpanelevent.cpp +++ b/linden/indra/newview/llpanelevent.cpp | |||
@@ -17,7 +17,8 @@ | |||
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://secondlifegrid.net/programs/open_source/licensing/flossexception | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | ||
21 | * | 22 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
@@ -276,11 +277,7 @@ void LLPanelEvent::onClickLandmark(void* data) | |||
276 | // static | 277 | // static |
277 | void LLPanelEvent::onClickCreateEvent(void* data) | 278 | void LLPanelEvent::onClickCreateEvent(void* data) |
278 | { | 279 | { |
279 | LLPanelEvent* self = (LLPanelEvent*)data; | 280 | LLNotifications::instance().add("PromptGoToEventsPage", LLSD(), LLSD(), callbackCreateEventWebPage); |
280 | |||
281 | gViewerWindow->alertXml("PromptGoToEventsPage", | ||
282 | callbackCreateEventWebPage, | ||
283 | self); | ||
284 | } | 281 | } |
285 | 282 | ||
286 | // static | 283 | // static |
@@ -301,12 +298,14 @@ void LLPanelEvent::onClickNotify(void *data) | |||
301 | } | 298 | } |
302 | 299 | ||
303 | // static | 300 | // static |
304 | void LLPanelEvent::callbackCreateEventWebPage(S32 option, void* data) | 301 | bool LLPanelEvent::callbackCreateEventWebPage(const LLSD& notification, const LLSD& response) |
305 | { | 302 | { |
303 | S32 option = LLNotification::getSelectedOption(notification, response); | ||
306 | if (0 == option) | 304 | if (0 == option) |
307 | { | 305 | { |
308 | llinfos << "Loading events page " << EVENTS_URL << llendl; | 306 | llinfos << "Loading events page " << EVENTS_URL << llendl; |
309 | 307 | ||
310 | LLWeb::loadURL(EVENTS_URL); | 308 | LLWeb::loadURL(EVENTS_URL); |
311 | } | 309 | } |
310 | return false; | ||
312 | } | 311 | } |