diff options
Diffstat (limited to 'indra/newview/macview_Prefix.h')
| -rw-r--r-- | indra/newview/macview_Prefix.h | 48 |
1 files changed, 18 insertions, 30 deletions
diff --git a/indra/newview/macview_Prefix.h b/indra/newview/macview_Prefix.h index 08c59bcedd..5936197a85 100644 --- a/indra/newview/macview_Prefix.h +++ b/indra/newview/macview_Prefix.h @@ -2,30 +2,25 @@ * @file macview_Prefix.h * @brief Prefix header for all source files of the 'newview' target in the 'newview' project. * - * $LicenseInfo:firstyear=2003&license=viewergpl$ - * - * Copyright (c) 2003-2007, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2003&license=viewerlgpl$ * Second Life Viewer Source Code - * 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 + * 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. * - * 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 + * 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. * - * 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. + * 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 * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -58,32 +53,26 @@ #include "llbox.h" #include "llbutton.h" -#include "llcameraview.h" #include "llconsole.h" #include "lldrawable.h" #include "llfirstuse.h" #include "llfloater.h" -#include "llfloateravatarinfo.h" #include "llfloaterbuildoptions.h" #include "llfloaterchat.h" -#include "llfloatercustomize.h" -#include "llfloaterdirectory.h" #include "llfloatergroups.h" -#include "llfloatermap.h" #include "llfloaterworldmap.h" #include "llfloatermute.h" #include "llconversation.h" #include "llfloatertools.h" #include "llhudeffectlookat.h" #include "llhudmanager.h" -#include "llinventoryview.h" #include "lljoystickbutton.h" #include "llmenugl.h" #include "llmorphview.h" #include "llmoveview.h" #include "llselectmgr.h" #include "llsky.h" -#include "llsphere.h" +#include "llrendersphere.h" #include "llstatusbar.h" #include "lltalkview.h" #include "lltool.h" @@ -92,7 +81,6 @@ #include "lltoolgrab.h" #include "lltoolmgr.h" #include "lltoolpie.h" -#include "lltoolview.h" #include "llui.h" // for make_ui_sound #include "llviewercamera.h" #include "llviewermenu.h" @@ -117,7 +105,7 @@ #include "llresmgr.h" #include "llui.h" #include "llviewborder.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" /////////////////// From lldrawpool.cpp @@ -172,7 +160,7 @@ #include "llviewerwindow.h" #include "llcontrol.h" #include "lluictrl.h" -#include "llvieweruictrlfactory.h" +#include "lluictrlfactory.h" #include "llviewborder.h" #include "llviewerimagelist.h" #include "llbutton.h" |