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/llpanelplacestab.cpp | |
parent | 9bf2dfbb39032d7407295089cf181de0987083e5 (diff) | |
parent | e7eced3c87310b15ac20cc3cd470d67686104a14 (diff) |
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
Diffstat (limited to 'indra/newview/llpanelplacestab.cpp')
-rw-r--r-- | indra/newview/llpanelplacestab.cpp | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/indra/newview/llpanelplacestab.cpp b/indra/newview/llpanelplacestab.cpp index 748a917147..3916e34e31 100644 --- a/indra/newview/llpanelplacestab.cpp +++ b/indra/newview/llpanelplacestab.cpp @@ -1,25 +1,25 @@ -/** +/** * @file llpanelplacestab.cpp * @brief Tabs interface for Side Bar "Places" panel * * $LicenseInfo:firstyear=2009&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$ */ @@ -42,35 +42,35 @@ LLButton* LLPanelPlacesTab::sRemoveBtn = NULL; bool LLPanelPlacesTab::isTabVisible() { - LLUICtrl* parent = getParentUICtrl(); - if (!parent) return false; - if (!parent->getVisible()) return false; - return true; + LLUICtrl* parent = getParentUICtrl(); + if (!parent) return false; + if (!parent->getVisible()) return false; + return true; } void LLPanelPlacesTab::onRegionResponse(const LLVector3d& landmark_global_pos, - U64 region_handle, - const std::string& url, - const LLUUID& snapshot_id, - bool teleport) + U64 region_handle, + const std::string& url, + const LLUUID& snapshot_id, + bool teleport) { - std::string sim_name; - bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( landmark_global_pos, sim_name ); + std::string sim_name; + bool gotSimName = LLWorldMap::getInstance()->simNameFromPosGlobal( landmark_global_pos, sim_name ); + + std::string sl_url; + if ( gotSimName ) + { + sl_url = LLSLURL(sim_name, landmark_global_pos).getSLURLString(); + } + else + { + sl_url = ""; + } - std::string sl_url; - if ( gotSimName ) - { - sl_url = LLSLURL(sim_name, landmark_global_pos).getSLURLString(); - } - else - { - sl_url = ""; - } + LLView::getWindow()->copyTextToClipboard(utf8str_to_wstring(sl_url)); - LLView::getWindow()->copyTextToClipboard(utf8str_to_wstring(sl_url)); - - LLSD args; - args["SLURL"] = sl_url; + LLSD args; + args["SLURL"] = sl_url; - LLNotificationsUtil::add("CopySLURL", args); + LLNotificationsUtil::add("CopySLURL", args); } |