diff options
author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/llpanellogin.h | |
parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/llpanellogin.h')
-rw-r--r-- | indra/newview/llpanellogin.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanellogin.h b/indra/newview/llpanellogin.h index 9d7e386cda..1f803fa57c 100644 --- a/indra/newview/llpanellogin.h +++ b/indra/newview/llpanellogin.h @@ -82,7 +82,7 @@ public: private: static void onClickConnect(void*); static void onClickNewAccount(void*); - static void newAccountAlertCallback(S32 option, void*); + static bool newAccountAlertCallback(const LLSD& notification, const LLSD& response); static void onClickQuit(void*); static void onClickVersion(void*); virtual void onNavigateComplete( const EventType& eventIn ); |