diff options
Diffstat (limited to 'indra/newview/llwaterparamset.h')
| -rw-r--r-- | indra/newview/llwaterparamset.h | 61 |
1 files changed, 28 insertions, 33 deletions
diff --git a/indra/newview/llwaterparamset.h b/indra/newview/llwaterparamset.h index f853140733..9957d5371b 100644 --- a/indra/newview/llwaterparamset.h +++ b/indra/newview/llwaterparamset.h @@ -2,30 +2,25 @@ * @file llwlparamset.h * @brief Interface for the LLWaterParamSet class. * - * $LicenseInfo:firstyear=2005&license=viewergpl$ - * - * Copyright (c) 2005-2007, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2005&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$ */ @@ -37,7 +32,7 @@ #include "v4math.h" #include "v4color.h" -#include "llglslshader.h" +#include "llviewershadermgr.h" class LLFloaterWater; class LLWaterParamSet; @@ -48,7 +43,7 @@ class LLWaterParamSet friend class LLWaterParamManager; public: - LLString mName; + std::string mName; private: @@ -70,20 +65,20 @@ public: /// Set a float parameter. /// \param paramName The name of the parameter to set. /// \param x The float value to set. - void set(const char * paramName, float x); + void set(const std::string& paramName, float x); /// Set a float2 parameter. /// \param paramName The name of the parameter to set. /// \param x The x component's value to set. /// \param y The y component's value to set. - void set(const char * paramName, float x, float y); + void set(const std::string& paramName, float x, float y); /// Set a float3 parameter. /// \param paramName The name of the parameter to set. /// \param x The x component's value to set. /// \param y The y component's value to set. /// \param z The z component's value to set. - void set(const char * paramName, float x, float y, float z); + void set(const std::string& paramName, float x, float y, float z); /// Set a float4 parameter. /// \param paramName The name of the parameter to set. @@ -91,42 +86,42 @@ public: /// \param y The y component's value to set. /// \param z The z component's value to set. /// \param w The w component's value to set. - void set(const char * paramName, float x, float y, float z, float w); + void set(const std::string& paramName, float x, float y, float z, float w); /// Set a float4 parameter. /// \param paramName The name of the parameter to set. /// \param val An array of the 4 float values to set the parameter to. - void set(const char * paramName, const float * val); + void set(const std::string& paramName, const float * val); /// Set a float4 parameter. /// \param paramName The name of the parameter to set. /// \param val A struct of the 4 float values to set the parameter to. - void set(const char * paramName, const LLVector4 & val); + void set(const std::string& paramName, const LLVector4 & val); /// Set a float4 parameter. /// \param paramName The name of the parameter to set. /// \param val A struct of the 4 float values to set the parameter to. - void set(const char * paramName, const LLColor4 & val); + void set(const std::string& paramName, const LLColor4 & val); /// Get a float4 parameter. /// \param paramName The name of the parameter to set. /// \param error A flag to set if it's not the proper return type - LLVector4 getVector4(const char * paramName, bool& error); + LLVector4 getVector4(const std::string& paramName, bool& error); /// Get a float3 parameter. /// \param paramName The name of the parameter to set. /// \param error A flag to set if it's not the proper return type - LLVector3 getVector3(const char * paramName, bool& error); + LLVector3 getVector3(const std::string& paramName, bool& error); /// Get a float2 parameter. /// \param paramName The name of the parameter to set. /// \param error A flag to set if it's not the proper return type - LLVector2 getVector2(const char * paramName, bool& error); + LLVector2 getVector2(const std::string& paramName, bool& error); /// Get an integer parameter /// \param paramName The name of the parameter to set. /// \param error A flag to set if it's not the proper return type - F32 getFloat(const char * paramName, bool& error); + F32 getFloat(const std::string& paramName, bool& error); /// interpolate two parameter sets /// \param src The parameter set to start with |