Merge remote-tracking branch 'origin/develop-linux' into geenz/linux-to-develop

1 files changed, 0 insertions, 41 deletions

diff --git a/indra/newview/tests/llwlparamset_stub.cpp b/indra/newview/tests/llwlparamset_stub.cpp
deleted file mode 100644
index e6c4221895..0000000000
--- a/indra/newview/tests/llwlparamset_stub.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * @file llwlparamset_stub.cpp
- * @brief  stub class to allow unit testing
- *
- * $LicenseInfo:firstyear=2009&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2011, 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
- * $/LicenseInfo$
- */
-
-LLWLParamSet::LLWLParamSet(void)
-{
-}
-
-void LLWLParamSet::updateCloudScrolling()
-{
-}
-
-void LLWLParamSet::set(const std::string& name, const LLVector4& val)
-{
-}
-
-void LLWLParamSet::update(LLGLSLShader *shader) const
-{
-}