diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:15:46 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-15 16:15:46 -0400 |
| commit | 1b5f0590ce45ce6e540d266a8902af5839885cfb (patch) | |
| tree | f923407fc28fb2f046ac451976a02490ab15787e /indra/newview/llfloatermyenvironment.h | |
| parent | f822193974af363fa4bb0208dc02848be6c983a2 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge commit 'e7eced3' into nat/releaseos for whitespace fix.
Diffstat (limited to 'indra/newview/llfloatermyenvironment.h')
| -rw-r--r-- | indra/newview/llfloatermyenvironment.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llfloatermyenvironment.h b/indra/newview/llfloatermyenvironment.h index fea0981590..54e23c4f6e 100644 --- a/indra/newview/llfloatermyenvironment.h +++ b/indra/newview/llfloatermyenvironment.h @@ -1,32 +1,32 @@ -/** +/** * @file llfloatermyenvironment.h * @brief LLFloaterMyEnvironment class header file * * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code * Copyright (C) 2019, 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$ */ #ifndef LL_LLFLOATERMYENVIRONMENT_H #define LL_LLFLOATERMYENVIRONMENT_H -#include <vector> +#include <vector> #include "llfloater.h" #include "llinventoryobserver.h" @@ -36,7 +36,7 @@ class LLInventoryPanel; class LLFloaterMyEnvironment -: public LLFloater, LLInventoryFetchDescendentsObserver +: public LLFloater, LLInventoryFetchDescendentsObserver { LOG_CLASS(LLFloaterMyEnvironment); public: |