diff options
Diffstat (limited to 'indra/llplugin/slplugin/slplugin.cpp')
| -rw-r--r-- | indra/llplugin/slplugin/slplugin.cpp | 58 |
1 files changed, 23 insertions, 35 deletions
diff --git a/indra/llplugin/slplugin/slplugin.cpp b/indra/llplugin/slplugin/slplugin.cpp index 7d69e1c5cd..7d6dde1a58 100644 --- a/indra/llplugin/slplugin/slplugin.cpp +++ b/indra/llplugin/slplugin/slplugin.cpp @@ -4,25 +4,30 @@ * * @cond * - * $LicenseInfo:firstyear=2008&license=viewerlgpl$ + * $LicenseInfo:firstyear=2008&license=viewergpl$ + * + * Copyright (c) 2008, Linden Research, Inc. + * * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * The source code in this file ("Source Code") is provided by Linden Lab + * to you under the terms of the GNU General Public License, version 2.0 + * ("GPL"), unless you have obtained a separate licensing agreement + * ("Other License"), formally executed by you and Linden Lab. Terms of + * the GPL can be found in doc/GPL-license.txt in this distribution, or + * online at http://secondlife.com/developers/opensource/gplv2 + * + * There are special exceptions to the terms and conditions of the GPL as + * it is applied to this Source Code. View the full text of the exception + * in the file doc/FLOSS-exception.txt in this software distribution, or + * online at http://secondlife.com/developers/opensource/flossexception + * + * By copying, modifying or distributing this software, you acknowledge + * that you have read and understood your obligations described above, + * and agree to abide by those obligations. + * + * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO + * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, + * COMPLETENESS OR PERFORMANCE. * $/LicenseInfo$ * * @endcond @@ -39,7 +44,6 @@ #if LL_DARWIN #include <Carbon/Carbon.h> - #include "slplugin-objc.h" #endif #if LL_DARWIN || LL_LINUX @@ -225,19 +229,10 @@ int main(int argc, char **argv) signal(SIGSYS, &crash_handler); // non-existent system call invoked #endif -#if LL_DARWIN - setupCocoa(); - createAutoReleasePool(); -#endif - LLPluginProcessChild *plugin = new LLPluginProcessChild(); plugin->init(port); -#if LL_DARWIN - deleteAutoReleasePool(); -#endif - LLTimer timer; timer.start(); @@ -265,9 +260,6 @@ int main(int argc, char **argv) #endif while(!plugin->isDone()) { -#if LL_DARWIN - createAutoReleasePool(); -#endif timer.reset(); plugin->idle(); #if LL_DARWIN @@ -385,10 +377,6 @@ int main(int argc, char **argv) // exception handler such as QuickTime. //checkExceptionHandler(); #endif - -#if LL_DARWIN - deleteAutoReleasePool(); -#endif } delete plugin; |