summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llappearancemgr.cpp2
-rw-r--r--indra/newview/llappearancemgr.h2
-rw-r--r--indra/newview/llfloatergodtools.cpp2
-rw-r--r--indra/newview/llfloaterluadebug.h12
-rw-r--r--indra/newview/llfloaterluascripts.cpp22
-rw-r--r--indra/newview/llfloaterluascripts.h12
-rw-r--r--indra/newview/llinventorygallerymenu.cpp4
-rw-r--r--indra/newview/llinventorylistener.cpp2
-rw-r--r--indra/newview/llluamanager.cpp14
-rw-r--r--indra/newview/llluamanager.h16
-rw-r--r--indra/newview/llpanelmaininventory.cpp2
-rw-r--r--indra/newview/llpanelobjectinventory.cpp4
-rw-r--r--indra/newview/lluilistener.cpp16
-rw-r--r--indra/newview/lluilistener.h10
-rw-r--r--indra/newview/llviewerchat.cpp2
-rw-r--r--indra/newview/llvoavatar.cpp2
-rw-r--r--indra/newview/tests/llluamanager_test.cpp2
17 files changed, 63 insertions, 63 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 72c20d377b..632366e801 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2957,7 +2957,7 @@ bool LLAppearanceMgr::wearOutfit(const LLUUID &cat_id, std::string &error_msg, b
return wearOutfit(stringize(cat_id), cat, error_msg, false, append);
}
-bool LLAppearanceMgr::wearOutfit(const std::string &desc, LLInventoryCategory* cat,
+bool LLAppearanceMgr::wearOutfit(const std::string &desc, LLInventoryCategory* cat,
std::string &error_msg, bool copy_items, bool append)
{
if (!cat)
diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h
index d15394df15..9e624f593f 100644
--- a/indra/newview/llappearancemgr.h
+++ b/indra/newview/llappearancemgr.h
@@ -264,7 +264,7 @@ private:
static void onOutfitRename(const LLSD& notification, const LLSD& response);
// used by both wearOutfit(LLUUID) and wearOutfitByName(std::string)
- bool wearOutfit(const std::string &desc, LLInventoryCategory* cat,
+ bool wearOutfit(const std::string &desc, LLInventoryCategory* cat,
std::string &error_msg, bool copy_items, bool append);
bool mAttachmentInvLinkEnabled;
diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp
index 4217b3ad49..f2884c3a6e 100644
--- a/indra/newview/llfloatergodtools.cpp
+++ b/indra/newview/llfloatergodtools.cpp
@@ -854,7 +854,7 @@ void LLPanelRegionTools::onSelectRegion()
LLPanelGridTools::LLPanelGridTools() :
LLPanel()
{
- mCommitCallbackRegistrar.add("GridTools.FlushMapVisibilityCaches",
+ mCommitCallbackRegistrar.add("GridTools.FlushMapVisibilityCaches",
{ boost::bind(&LLPanelGridTools::onClickFlushMapVisibilityCaches, this), cb_info::UNTRUSTED_BLOCK });
}
diff --git a/indra/newview/llfloaterluadebug.h b/indra/newview/llfloaterluadebug.h
index e513d9a095..9f044df9d9 100644
--- a/indra/newview/llfloaterluadebug.h
+++ b/indra/newview/llfloaterluadebug.h
@@ -1,24 +1,24 @@
-/**
+/**
* @file llfloaterluadebug.h
*
* $LicenseInfo:firstyear=2023&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2023, 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$
*/
@@ -41,7 +41,7 @@ extern "C"
class LLLineEditor;
class LLTextEditor;
-class LLFloaterLUADebug :
+class LLFloaterLUADebug :
public LLFloater
{
public:
diff --git a/indra/newview/llfloaterluascripts.cpp b/indra/newview/llfloaterluascripts.cpp
index 189ee0c9d1..60cdadfbee 100644
--- a/indra/newview/llfloaterluascripts.cpp
+++ b/indra/newview/llfloaterluascripts.cpp
@@ -1,24 +1,24 @@
-/**
+/**
* @file llfloaterluascriptsinfo.cpp
*
* $LicenseInfo:firstyear=2024&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2024, 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$
*/
@@ -41,16 +41,16 @@ LLFloaterLUAScripts::LLFloaterLUAScripts(const LLSD &key)
mUpdateTimer(new LLTimer()),
mContextMenuHandle()
{
- mCommitCallbackRegistrar.add("Script.OpenFolder", {[this](LLUICtrl*, const LLSD &userdata)
- {
+ mCommitCallbackRegistrar.add("Script.OpenFolder", {[this](LLUICtrl*, const LLSD &userdata)
+ {
if (mScriptList->hasSelectedItem())
{
std::string target_folder_path = std::filesystem::path((mScriptList->getFirstSelected()->getColumn(1)->getValue().asString())).parent_path().string();
gViewerWindow->getWindow()->openFolder(target_folder_path);
}
}, cb_info::UNTRUSTED_BLOCK });
- mCommitCallbackRegistrar.add("Script.Terminate", {[this](LLUICtrl*, const LLSD &userdata)
- {
+ mCommitCallbackRegistrar.add("Script.Terminate", {[this](LLUICtrl*, const LLSD &userdata)
+ {
if (mScriptList->hasSelectedItem())
{
std::string coro_name = mScriptList->getSelectedValue();
@@ -75,7 +75,7 @@ BOOL LLFloaterLUAScripts::postBuild()
return TRUE;
}
-LLFloaterLUAScripts::~LLFloaterLUAScripts()
+LLFloaterLUAScripts::~LLFloaterLUAScripts()
{
auto menu = mContextMenuHandle.get();
if (menu)
@@ -94,7 +94,7 @@ void LLFloaterLUAScripts::draw()
LLFloater::draw();
}
-void LLFloaterLUAScripts::populateScriptList()
+void LLFloaterLUAScripts::populateScriptList()
{
S32 prev_pos = mScriptList->getScrollPos();
LLSD prev_selected = mScriptList->getSelectedValue();
diff --git a/indra/newview/llfloaterluascripts.h b/indra/newview/llfloaterluascripts.h
index 932c5c78dd..24d3f00a80 100644
--- a/indra/newview/llfloaterluascripts.h
+++ b/indra/newview/llfloaterluascripts.h
@@ -1,24 +1,24 @@
-/**
+/**
* @file llfloaterluascriptsinfo.h
*
* $LicenseInfo:firstyear=2024&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2024, 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$
*/
@@ -30,7 +30,7 @@
class LLScrollListCtrl;
-class LLFloaterLUAScripts :
+class LLFloaterLUAScripts :
public LLFloater
{
public:
diff --git a/indra/newview/llinventorygallerymenu.cpp b/indra/newview/llinventorygallerymenu.cpp
index 2845c5b614..133ef51a21 100644
--- a/indra/newview/llinventorygallerymenu.cpp
+++ b/indra/newview/llinventorygallerymenu.cpp
@@ -92,9 +92,9 @@ LLContextMenu* LLInventoryGalleryContextMenu::createMenu()
registrar.add("Inventory.DoToSelected", boost::bind(&LLInventoryGalleryContextMenu::doToSelected, this, _2), LLUICtrl::cb_info::UNTRUSTED_BLOCK);
registrar.add("Inventory.FileUploadLocation", boost::bind(&LLInventoryGalleryContextMenu::fileUploadLocation, this, _2), LLUICtrl::cb_info::UNTRUSTED_BLOCK);
- registrar.add("Inventory.EmptyTrash",
+ registrar.add("Inventory.EmptyTrash",
boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH), LLUICtrl::cb_info::UNTRUSTED_BLOCK);
- registrar.add("Inventory.EmptyLostAndFound",
+ registrar.add("Inventory.EmptyLostAndFound",
boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND), LLUICtrl::cb_info::UNTRUSTED_BLOCK);
registrar.add("Inventory.DoCreate", [this](LLUICtrl*, const LLSD& data)
{
diff --git a/indra/newview/llinventorylistener.cpp b/indra/newview/llinventorylistener.cpp
index 157e04dce3..9263663997 100644
--- a/indra/newview/llinventorylistener.cpp
+++ b/indra/newview/llinventorylistener.cpp
@@ -154,7 +154,7 @@ void LLInventoryListener::getBasicFolderID(LLSD const &data)
void LLInventoryListener::getDirectDescendents(LLSD const &data)
{
Response response(LLSD(), data);
- LLInventoryModel::cat_array_t* cats;
+ LLInventoryModel::cat_array_t* cats;
LLInventoryModel::item_array_t* items;
gInventory.getDirectDescendentsOf(data["folder_id"], cats, items);
diff --git a/indra/newview/llluamanager.cpp b/indra/newview/llluamanager.cpp
index 22b51d7b72..41b1cd55b7 100644
--- a/indra/newview/llluamanager.cpp
+++ b/indra/newview/llluamanager.cpp
@@ -1,25 +1,25 @@
-/**
+/**
* @file llluamanager.cpp
- * @brief classes and functions for interfacing with LUA.
+ * @brief classes and functions for interfacing with LUA.
*
* $LicenseInfo:firstyear=2023&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2023, 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$
*
@@ -193,7 +193,7 @@ void LLLUAmanager::runScriptFile(const std::string &filename, script_result_fn r
llifstream in_file;
in_file.open(filename.c_str());
- if (in_file.is_open())
+ if (in_file.is_open())
{
// A script_finished_fn is used to initialize the LuaState.
// It will be called when the LuaState is destroyed.
diff --git a/indra/newview/llluamanager.h b/indra/newview/llluamanager.h
index 50f922a80f..08997c29a5 100644
--- a/indra/newview/llluamanager.h
+++ b/indra/newview/llluamanager.h
@@ -1,25 +1,25 @@
-/**
+/**
* @file llluamanager.h
- * @brief classes and functions for interfacing with LUA.
+ * @brief classes and functions for interfacing with LUA.
*
* $LicenseInfo:firstyear=2023&license=viewerlgpl$
* Second Life Viewer Source Code
* Copyright (C) 2023, 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$
*/
@@ -110,9 +110,9 @@ class LLRequireResolver
class ScriptObserver
{
public:
- ScriptObserver(const std::string &coro_name, const std::string &filename) : mCoroName(coro_name)
+ ScriptObserver(const std::string &coro_name, const std::string &filename) : mCoroName(coro_name)
{
- LLLUAmanager::sScriptNames[mCoroName] = filename;
+ LLLUAmanager::sScriptNames[mCoroName] = filename;
}
~ScriptObserver() { LLLUAmanager::sScriptNames.erase(mCoroName); }
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index fc5390e0dc..622698c5fa 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -127,7 +127,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
// Menu Callbacks (non contex menus)
mCommitCallbackRegistrar.add("Inventory.DoToSelected", { boost::bind(&LLPanelMainInventory::doToSelected, this, _2), LLUICtrl::cb_info::UNTRUSTED_BLOCK });
mCommitCallbackRegistrar.add("Inventory.CloseAllFolders", { boost::bind(&LLPanelMainInventory::closeAllFolders, this) });
- mCommitCallbackRegistrar.add("Inventory.EmptyTrash", { boost::bind(&LLInventoryModel::emptyFolderType, &gInventory,
+ mCommitCallbackRegistrar.add("Inventory.EmptyTrash", { boost::bind(&LLInventoryModel::emptyFolderType, &gInventory,
"ConfirmEmptyTrash", LLFolderType::FT_TRASH), LLUICtrl::cb_info::UNTRUSTED_BLOCK });
mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", { boost::bind(&LLInventoryModel::emptyFolderType, &gInventory,
"ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND), LLUICtrl::cb_info::UNTRUSTED_BLOCK });
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index 64a9518e21..395e9eca82 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -1347,9 +1347,9 @@ LLPanelObjectInventory::LLPanelObjectInventory(const LLPanelObjectInventory::Par
{
// Setup context menu callbacks
mCommitCallbackRegistrar.add("Inventory.DoToSelected", { boost::bind(&LLPanelObjectInventory::doToSelected, this, _2), cb_info::UNTRUSTED_BLOCK });
- mCommitCallbackRegistrar.add("Inventory.EmptyTrash",
+ mCommitCallbackRegistrar.add("Inventory.EmptyTrash",
{ boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH), cb_info::UNTRUSTED_BLOCK });
- mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound",
+ mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound",
{ boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND), cb_info::UNTRUSTED_BLOCK });
mCommitCallbackRegistrar.add("Inventory.DoCreate", { boost::bind(&do_nothing) });
mCommitCallbackRegistrar.add("Inventory.AttachObject", { boost::bind(&do_nothing) });
diff --git a/indra/newview/lluilistener.cpp b/indra/newview/lluilistener.cpp
index 0280836075..6f567e67f8 100644
--- a/indra/newview/lluilistener.cpp
+++ b/indra/newview/lluilistener.cpp
@@ -3,25 +3,25 @@
* @author Nat Goodspeed
* @date 2009-08-18
* @brief Implementation for lluilistener.
- *
+ *
* $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$
*/
@@ -93,7 +93,7 @@ LLUIListener::LLUIListener():
"to the [\"parent_menu\"] within the Top menu.",
&LLUIListener::addMenuItem,
required_args.with("func", LLSD()));
-
+
add("addMenuSeparator",
"Add menu separator to the [\"parent_menu\"] within the Top menu.",
&LLUIListener::addMenuSeparator,
@@ -147,7 +147,7 @@ void LLUIListener::call(const LLSD& event)
{
return response.error(stringize("Function ", std::quoted(event["function"].asString()), " was not found"));
}
- if (info->handle_untrusted == cb_info::UNTRUSTED_BLOCK)
+ if (info->handle_untrusted == cb_info::UNTRUSTED_BLOCK)
{
return response.error(stringize("Function ", std::quoted(event["function"].asString()), " may not be called from the script"));
}
@@ -226,7 +226,7 @@ void LLUIListener::getValue(const LLSD& event) const
const LLView* view = LLUI::getInstance()->resolvePath(root, event["path"].asString());
const LLUICtrl* ctrl(dynamic_cast<const LLUICtrl*>(view));
- if (ctrl)
+ if (ctrl)
{
response["value"] = ctrl->getValue();
}
diff --git a/indra/newview/lluilistener.h b/indra/newview/lluilistener.h
index c839c03a57..8fc8e6ebb4 100644
--- a/indra/newview/lluilistener.h
+++ b/indra/newview/lluilistener.h
@@ -3,25 +3,25 @@
* @author Nat Goodspeed
* @date 2009-08-18
* @brief Engage named functions as specified by XUI
- *
+ *
* $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$
*/
diff --git a/indra/newview/llviewerchat.cpp b/indra/newview/llviewerchat.cpp
index 00520f100e..440c0a2f69 100644
--- a/indra/newview/llviewerchat.cpp
+++ b/indra/newview/llviewerchat.cpp
@@ -227,7 +227,7 @@ void LLViewerChat::formatChatMsg(const LLChat& chat, std::string& formated_msg)
formated_msg = tmpmsg;
}
- if (chat.mIsScript)
+ if (chat.mIsScript)
{
formated_msg = LLTrans::getString("ScriptStr") + formated_msg;
}
diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index ae6500da70..7f8f3961d3 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -11784,7 +11784,7 @@ class LLVOAvatarListener : public LLEventAPI
}
void isInAir(const LLSD &request) const
{
- Response response(llsd::map("value", gAgentAvatarp->mInAir,
+ Response response(llsd::map("value", gAgentAvatarp->mInAir,
"duration", gAgentAvatarp->mInAir ? gAgentAvatarp->mTimeInAir.getElapsedTimeF32() : 0), request);
}
};
diff --git a/indra/newview/tests/llluamanager_test.cpp b/indra/newview/tests/llluamanager_test.cpp
index 3209d93d39..4b143b52db 100644
--- a/indra/newview/tests/llluamanager_test.cpp
+++ b/indra/newview/tests/llluamanager_test.cpp
@@ -3,7 +3,7 @@
* @author Nat Goodspeed
* @date 2023-09-28
* @brief Test for llluamanager.
- *
+ *
* $LicenseInfo:firstyear=2023&license=viewerlgpl$
* Copyright (c) 2023, Linden Research, Inc.
* $/LicenseInfo$
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 05:09:03 +0000