diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-22 20:51:58 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-22 20:51:58 +0300 |
commit | 6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a (patch) | |
tree | fab23811a5cedc1ebf01479c852ee92ff62b636c /indra/newview/llhints.h | |
parent | ef8f4819822288e044ea719feb6af7a1f4df4c4e (diff) | |
parent | 7bb5afc11ee5a6af78302a8d76a9a619e2baaab2 (diff) |
Merge pull request #1545 from Ansariel/DRTVWR-600-maint-A
Merge main into DRTVWR-600-maint-a
Diffstat (limited to 'indra/newview/llhints.h')
-rw-r--r-- | indra/newview/llhints.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/indra/newview/llhints.h b/indra/newview/llhints.h index 1f730734d0..e661ef304b 100644 --- a/indra/newview/llhints.h +++ b/indra/newview/llhints.h @@ -5,21 +5,21 @@ * $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$ */ @@ -34,20 +34,20 @@ class LLHints : public LLSingleton<LLHints> { - LLSINGLETON(LLHints); - ~LLHints(); + LLSINGLETON(LLHints); + ~LLHints(); public: - void show(LLNotificationPtr hint); - void hide(LLNotificationPtr hint); - void registerHintTarget(const std::string& name, LLHandle<LLView> target); - LLHandle<LLView> getHintTarget(const std::string& name); + void show(LLNotificationPtr hint); + void hide(LLNotificationPtr hint); + void registerHintTarget(const std::string& name, LLHandle<LLView> target); + LLHandle<LLView> getHintTarget(const std::string& name); private: - LLRegistry<std::string, LLHandle<LLView> > mTargetRegistry; - typedef std::map<LLNotificationPtr, class LLHintPopup*> hint_map_t; - hint_map_t mHints; - void showHints(const LLSD& show); + LLRegistry<std::string, LLHandle<LLView> > mTargetRegistry; + typedef std::map<LLNotificationPtr, class LLHintPopup*> hint_map_t; + hint_map_t mHints; + void showHints(const LLSD& show); - boost::signals2::connection mControlConnection; + boost::signals2::connection mControlConnection; }; |