From c6673cf104e0b10c80da88120f8755af22dd26fd Mon Sep 17 00:00:00 2001 From: Cinder <cinder.roxley@phoenixviewer.com> Date: Sat, 16 Aug 2014 08:57:00 -0600 Subject: [PATCH] Update license headers --- indra/newview/llosxnotificationcenter.h | 30 +++++++++++++++++++----- indra/newview/llosxnotificationcenter.mm | 30 +++++++++++++++++++----- indra/newview/llpanelprofilelegacy.cpp | 2 +- indra/newview/llpanelprofilelegacy.h | 2 +- 4 files changed, 50 insertions(+), 14 deletions(-) diff --git a/indra/newview/llosxnotificationcenter.h b/indra/newview/llosxnotificationcenter.h index 22e5960b81..650ea58916 100644 --- a/indra/newview/llosxnotificationcenter.h +++ b/indra/newview/llosxnotificationcenter.h @@ -2,12 +2,30 @@ * @file llnotificationcenter.h * @brief Mac OSX Notification Center support * - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * Cinder Roxley wrote this file. As long as you retain this notice you can do - * whatever you want with this stuff. If we meet some day, and you think this - * stuff is worth it, you can buy me a beer in return <cinder.roxley@phoenixviewer.com> - * ---------------------------------------------------------------------------- + * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org> + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare derivative works of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * */ #ifndef LL_NOTIFICATIONCENTER_H diff --git a/indra/newview/llosxnotificationcenter.mm b/indra/newview/llosxnotificationcenter.mm index a92e7c21f5..8faf2b1eaf 100644 --- a/indra/newview/llosxnotificationcenter.mm +++ b/indra/newview/llosxnotificationcenter.mm @@ -2,12 +2,30 @@ * @file llnotificationcenter.mm * @brief Mac OSX Notification Center support * - * ---------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * Cinder Roxley wrote this file. As long as you retain this notice you can do - * whatever you want with this stuff. If we meet some day, and you think this - * stuff is worth it, you can buy me a beer in return <cinder.roxley@phoenixviewer.com> - * ---------------------------------------------------------------------------- + * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org> + * + * Permission is hereby granted, free of charge, to any person or organization + * obtaining a copy of the software and accompanying documentation covered by + * this license (the "Software") to use, reproduce, display, distribute, + * execute, and transmit the Software, and to prepare derivative works of the + * Software, and to permit third-parties to whom the Software is furnished to + * do so, all subject to the following: + * + * The copyright notices in the Software and this entire statement, including + * the above license grant, this restriction and the following disclaimer, + * must be included in all copies of the Software, in whole or in part, and + * all derivative works of the Software, unless such copies or derivative + * works are solely in the form of machine-executable object code generated by + * a source language processor. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT + * SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE + * FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * */ #ifndef LL_DARWIN diff --git a/indra/newview/llpanelprofilelegacy.cpp b/indra/newview/llpanelprofilelegacy.cpp index 56d867e0ce..5531292c9a 100644 --- a/indra/newview/llpanelprofilelegacy.cpp +++ b/indra/newview/llpanelprofilelegacy.cpp @@ -2,7 +2,7 @@ * @file llpanelprofilelegacy.cpp * @brief Legacy protocol avatar profile panel * - * Copyright (C) 2014, Cinder Roxley <cinder.roxley@phoenixviewer.com> + * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org> * * Permission is hereby granted, free of charge, to any person or organization * obtaining a copy of the software and accompanying documentation covered by diff --git a/indra/newview/llpanelprofilelegacy.h b/indra/newview/llpanelprofilelegacy.h index 65d40d9bb9..01c9e4d2b8 100644 --- a/indra/newview/llpanelprofilelegacy.h +++ b/indra/newview/llpanelprofilelegacy.h @@ -2,7 +2,7 @@ * @file llpanelprofilelegacy.h * @brief Legacy protocol avatar profile panel * - * Copyright (C) 2014, Cinder Roxley <cinder.roxley@phoenixviewer.com> + * Copyright (c) 2014, Cinder Roxley <cinder@sdf.org> * * Permission is hereby granted, free of charge, to any person or organization * obtaining a copy of the software and accompanying documentation covered by -- GitLab