diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 08:40:49 -0400 |
commit | 22a47eee84dbaa5c731c000c6013ca558bd15892 (patch) | |
tree | 8b3128fdb91731d95025b86701431826c441c5ba /indra/newview/llfloaterprofiletexture.h | |
parent | a6b85244a6f943a4598ff9b7b8a3343eb1e0d11e (diff) | |
parent | 7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (diff) |
Merge branch 'release/luau-scripting' into lua-resultset
Diffstat (limited to 'indra/newview/llfloaterprofiletexture.h')
-rw-r--r-- | indra/newview/llfloaterprofiletexture.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llfloaterprofiletexture.h b/indra/newview/llfloaterprofiletexture.h index 12efbab572..cdb1b92ba9 100644 --- a/indra/newview/llfloaterprofiletexture.h +++ b/indra/newview/llfloaterprofiletexture.h @@ -1,25 +1,25 @@ -/** +/** * @file llfloaterprofiletexture.h * @brief LLFloaterProfileTexture class definition * * $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$ */ @@ -54,12 +54,12 @@ public: boost::signals2::connection setImageLoadedCallback(const image_loaded_signal_t::slot_type& cb); private: void onImageLoaded(bool success, LLViewerFetchedTexture* src_vi); - static void onImageLoaded(BOOL success, + static void onImageLoaded(bool success, LLViewerFetchedTexture* src_vi, LLImageRaw* src, LLImageRaw* aux_src, S32 discard_level, - BOOL final, + bool final, void* userdata); void releaseTexture(); @@ -85,13 +85,13 @@ public: void resetAsset(); void loadAsset(const LLUUID &image_id); - void onImageLoaded(BOOL success, LLViewerFetchedTexture* imagep); + void onImageLoaded(bool success, LLViewerFetchedTexture* imagep); - void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) override; + void reshape(S32 width, S32 height, bool called_from_parent = true) override; LLHandle<LLFloater> getHandle() const { return LLFloater::getHandle(); } protected: - BOOL postBuild() override; + bool postBuild() override; private: void updateDimensions(); |