summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterprofiletexture.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-15 16:15:46 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-15 16:15:46 -0400
commit1b5f0590ce45ce6e540d266a8902af5839885cfb (patch)
treef923407fc28fb2f046ac451976a02490ab15787e /indra/newview/llfloaterprofiletexture.cpp
parentf822193974af363fa4bb0208dc02848be6c983a2 (diff)
parente7eced3c87310b15ac20cc3cd470d67686104a14 (diff)
Merge commit 'e7eced3' into nat/releaseos for whitespace fix.
Diffstat (limited to 'indra/newview/llfloaterprofiletexture.cpp')
-rw-r--r--indra/newview/llfloaterprofiletexture.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llfloaterprofiletexture.cpp b/indra/newview/llfloaterprofiletexture.cpp
index ec2e627165..8b36072034 100644
--- a/indra/newview/llfloaterprofiletexture.cpp
+++ b/indra/newview/llfloaterprofiletexture.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llfloaterprofiletexture.cpp
* @brief LLFloaterProfileTexture class implementation
*
* $LicenseInfo:firstyear=2022&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2022, 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$
*/
@@ -70,13 +70,13 @@ BOOL LLFloaterProfileTexture::postBuild()
mCloseButton = getChild<LLButton>("close_btn");
mCloseButton->setCommitCallback([this](LLUICtrl*, void*) { closeFloater(); }, nullptr);
- return TRUE;
+ return TRUE;
}
// virtual
void LLFloaterProfileTexture::reshape(S32 width, S32 height, BOOL called_from_parent)
{
- LLFloater::reshape(width, height, called_from_parent);
+ LLFloater::reshape(width, height, called_from_parent);
}
// It takes a while until we get height and width information.