diff --git a/indra/llappearance/CMakeLists.txt b/indra/llappearance/CMakeLists.txt index 53b62fa1a..98b9d3676 100644 --- a/indra/llappearance/CMakeLists.txt +++ b/indra/llappearance/CMakeLists.txt @@ -43,7 +43,7 @@ set(llappearance_SOURCE_FILES #llwearable.cpp #llwearabledata.cpp llwearabletype.cpp - #llviewervisualparam.cpp + llviewervisualparam.cpp llavatarappearancedefines.cpp ) @@ -66,7 +66,7 @@ set(llappearance_HEADER_FILES #llwearable.h #llwearabledata.h llwearabletype.h - #llviewervisualparam.h + llviewervisualparam.h llavatarappearancedefines.h ) diff --git a/indra/newview/llviewervisualparam.cpp b/indra/llappearance/llviewervisualparam.cpp similarity index 78% rename from indra/newview/llviewervisualparam.cpp rename to indra/llappearance/llviewervisualparam.cpp index 422e530dc..0c3d1fef8 100644 --- a/indra/newview/llviewervisualparam.cpp +++ b/indra/llappearance/llviewervisualparam.cpp @@ -2,43 +2,37 @@ * @file llviewervisualparam.cpp * @brief Implementation of LLViewerVisualParam class * - * $LicenseInfo:firstyear=2001&license=viewergpl$ - * - * Copyright (c) 2001-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2001&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://secondlifegrid.net/programs/open_source/licensing/gplv2 + * Copyright (C) 2010, Linden Research, Inc. * - * 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://secondlifegrid.net/programs/open_source/licensing/flossexception + * 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. * - * 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. + * 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. * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * 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 * $/LicenseInfo$ */ //----------------------------------------------------------------------------- // Header Files //----------------------------------------------------------------------------- -#include "llviewerprecompiledheaders.h" +#include "linden_common.h" #include "llviewervisualparam.h" #include "llxmltree.h" -#include "llui.h" -#include "llwearable.h" +//#include "llui.h" +#include "llwearabletype.h" //----------------------------------------------------------------------------- // LLViewerVisualParamInfo() diff --git a/indra/newview/llviewervisualparam.h b/indra/llappearance/llviewervisualparam.h similarity index 100% rename from indra/newview/llviewervisualparam.h rename to indra/llappearance/llviewervisualparam.h diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 4cfdf67a8..0530ed0c0 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -510,7 +510,6 @@ set(viewer_SOURCE_FILES llviewertextureanim.cpp llviewertexturelist.cpp llviewerthrottle.cpp - llviewervisualparam.cpp llviewerwindow.cpp llvlcomposition.cpp llvlmanager.cpp @@ -1017,7 +1016,6 @@ set(viewer_HEADER_FILES llviewertextureanim.h llviewertexturelist.h llviewerthrottle.h - llviewervisualparam.h llviewerwindow.h llvlcomposition.h llvlmanager.h