diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-01 08:16:58 +0300 |
| commit | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (patch) | |
| tree | b3469444ea8dabe4e76a8a265ac086a9db78891c /indra/newview/llappviewermacosx.h | |
| parent | 9bf2dfbb39032d7407295089cf181de0987083e5 (diff) | |
| parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) | |
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
Diffstat (limited to 'indra/newview/llappviewermacosx.h')
| -rw-r--r-- | indra/newview/llappviewermacosx.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/indra/newview/llappviewermacosx.h b/indra/newview/llappviewermacosx.h index 15c55c44a6..d50812a35e 100644 --- a/indra/newview/llappviewermacosx.h +++ b/indra/newview/llappviewermacosx.h @@ -5,24 +5,24 @@ * $LicenseInfo:firstyear=2007&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$ - */ + */ #ifndef LL_LLAPPVIEWERMACOSX_H #define LL_LLAPPVIEWERMACOSX_H @@ -34,21 +34,21 @@ class LLAppViewerMacOSX : public LLAppViewer { public: - LLAppViewerMacOSX(); - virtual ~LLAppViewerMacOSX(); + LLAppViewerMacOSX(); + virtual ~LLAppViewerMacOSX(); - // - // Main application logic - // - virtual bool init(); // Override to do application initialization + // + // Main application logic + // + virtual bool init(); // Override to do application initialization virtual void forceErrorOSSpecificException(); protected: - virtual bool restoreErrorTrap(); + virtual bool restoreErrorTrap(); - std::string generateSerialNumber(); - virtual bool initParseCommandLine(LLCommandLineParser& clp); + std::string generateSerialNumber(); + virtual bool initParseCommandLine(LLCommandLineParser& clp); }; #endif // LL_LLAPPVIEWERMACOSX_H |