diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2024-05-20 12:59:59 -0700 |
| commit | 3a212d9608492ae64a3a32f80790371b90be9e9e (patch) | |
| tree | fcb3901b838af753e40c2ddd1ce84b95a6c2f603 /indra/llrender/lltexture.cpp | |
| parent | c7461061b8113fa258611b1a31f16a119fad1a2c (diff) | |
| parent | e1623bb276f83a43ce7a197e388720c05bdefe61 (diff) | |
Merge branch 'spaces-merge' into roxie/webrtc-voice
Diffstat (limited to 'indra/llrender/lltexture.cpp')
| -rw-r--r-- | indra/llrender/lltexture.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/llrender/lltexture.cpp b/indra/llrender/lltexture.cpp index 6eef36216c..980c0950f9 100644 --- a/indra/llrender/lltexture.cpp +++ b/indra/llrender/lltexture.cpp @@ -1,31 +1,31 @@ -/** +/** * @file lltexture.cpp * * $LicenseInfo:firstyear=2000&license=viewerlgpl$ * 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 * $/LicenseInfo$ */ #include "linden_common.h" #include "lltexture.h" -//virtual +//virtual LLTexture::~LLTexture() { } @@ -36,8 +36,8 @@ bool LLTexture::bindDefaultImage(const S32 stage) { llassert(false); return fals bool LLTexture::bindDebugImage(const S32 stage) { llassert(false); return false; } void LLTexture::forceImmediateUpdate() { llassert(false); } void LLTexture::setActive() { llassert(false); } -S32 LLTexture::getWidth(S32 discard_level) const { llassert(false); return 0; } -S32 LLTexture::getHeight(S32 discard_level) const { llassert(false); return 0; } +S32 LLTexture::getWidth(S32 discard_level) const { llassert(false); return 0; } +S32 LLTexture::getHeight(S32 discard_level) const { llassert(false); return 0; } bool LLTexture::isActiveFetching() { llassert(false); return false; } LLImageGL* LLTexture::getGLTexture() const { llassert(false); return nullptr; } void LLTexture::updateBindStatsForTester() { } |