From 79928fc1fef2bcc02d97cd2cc0da0ea6d0f35227 Mon Sep 17 00:00:00 2001 From: Beq Date: Tue, 16 Aug 2022 17:57:37 +0100 Subject: [PATCH] post rename updates --- indra/newview/CMakeLists.txt | 12 ++++++------ indra/newview/llviewerfloaterreg.cpp | 4 ++-- ...loaterlocalmesh.xml => floater_vj_local_mesh.xml} | 0 ...llfloaterlocalmesh.cpp => vjfloaterlocalmesh.cpp} | 4 ++-- .../{llfloaterlocalmesh.h => vjfloaterlocalmesh.h} | 0 indra/newview/{lllocalmesh.cpp => vjlocalmesh.cpp} | 6 +++--- indra/newview/{lllocalmesh.h => vjlocalmesh.h} | 0 ...calmeshimportdae.cpp => vjlocalmeshimportdae.cpp} | 4 ++-- ...lllocalmeshimportdae.h => vjlocalmeshimportdae.h} | 0 9 files changed, 15 insertions(+), 15 deletions(-) rename indra/newview/skins/default/xui/en/{llfloaterlocalmesh.xml => floater_vj_local_mesh.xml} (100%) rename indra/newview/{llfloaterlocalmesh.cpp => vjfloaterlocalmesh.cpp} (99%) rename indra/newview/{llfloaterlocalmesh.h => vjfloaterlocalmesh.h} (100%) rename indra/newview/{lllocalmesh.cpp => vjlocalmesh.cpp} (99%) rename indra/newview/{lllocalmesh.h => vjlocalmesh.h} (100%) rename indra/newview/{lllocalmeshimportdae.cpp => vjlocalmeshimportdae.cpp} (99%) rename indra/newview/{lllocalmeshimportdae.h => vjlocalmeshimportdae.h} (100%) diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index a0e2a01612..e621237473 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -223,9 +223,9 @@ set(viewer_SOURCE_FILES llagentwearablesfetch.cpp # local mesh - lllocalmesh.cpp - llfloaterlocalmesh.cpp - lllocalmeshimportdae.cpp + vjlocalmesh.cpp + vjfloaterlocalmesh.cpp + vjlocalmeshimportdae.cpp llaccountingcostmanager.cpp llaisapi.cpp @@ -1002,9 +1002,9 @@ set(viewer_HEADER_FILES llagentwearablesfetch.h # local mesh - lllocalmesh.h - llfloaterlocalmesh.h - lllocalmeshimportdae.h + vjlocalmesh.h + vjfloaterlocalmesh.h + vjlocalmeshimportdae.h llaccountingcostmanager.h llaisapi.h diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index ff640eec30..355d387e26 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -221,7 +221,7 @@ #include "NACLfloaterexploresounds.h" #include "particleeditor.h" #include "quickprefs.h" -#include "llfloaterlocalmesh.h" // local mesh +#include "vjfloaterlocalmesh.h" // local mesh // handle secondlife:///app/openfloater/{NAME} URLs @@ -524,7 +524,7 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("sound_explorer", "floater_NACL_explore_sounds.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("vram_usage", "floater_fs_vram_usage.xml", static_cast( &LLFloaterReg::build< FSFloaterVRAMUsage >) ); - LLFloaterReg::add("local_mesh_floater", "llfloaterlocalmesh.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // local mesh + LLFloaterReg::add("local_mesh_floater", "floater_vj_local_mesh.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); // local mesh LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving } diff --git a/indra/newview/skins/default/xui/en/llfloaterlocalmesh.xml b/indra/newview/skins/default/xui/en/floater_vj_local_mesh.xml similarity index 100% rename from indra/newview/skins/default/xui/en/llfloaterlocalmesh.xml rename to indra/newview/skins/default/xui/en/floater_vj_local_mesh.xml diff --git a/indra/newview/llfloaterlocalmesh.cpp b/indra/newview/vjfloaterlocalmesh.cpp similarity index 99% rename from indra/newview/llfloaterlocalmesh.cpp rename to indra/newview/vjfloaterlocalmesh.cpp index 3ac149c391..2c673b0658 100644 --- a/indra/newview/llfloaterlocalmesh.cpp +++ b/indra/newview/vjfloaterlocalmesh.cpp @@ -40,8 +40,8 @@ #include "llviewerobjectlist.h" // own headers -#include "llfloaterlocalmesh.h" -#include "lllocalmesh.h" +#include "vjfloaterlocalmesh.h" +#include "vjlocalmesh.h" static const S32 LOCAL_TRACKING_ID_COLUMN = 4; diff --git a/indra/newview/llfloaterlocalmesh.h b/indra/newview/vjfloaterlocalmesh.h similarity index 100% rename from indra/newview/llfloaterlocalmesh.h rename to indra/newview/vjfloaterlocalmesh.h diff --git a/indra/newview/lllocalmesh.cpp b/indra/newview/vjlocalmesh.cpp similarity index 99% rename from indra/newview/lllocalmesh.cpp rename to indra/newview/vjlocalmesh.cpp index d9239f4ab9..40eb5bec51 100644 --- a/indra/newview/lllocalmesh.cpp +++ b/indra/newview/vjlocalmesh.cpp @@ -42,11 +42,11 @@ #include // local mesh headers -#include "lllocalmesh.h" -#include "llfloaterlocalmesh.h" +#include "vjlocalmesh.h" +#include "vjfloaterlocalmesh.h" // local mesh importers -#include "lllocalmeshimportdae.h" +#include "vjlocalmeshimportdae.h" /*==========================================*/ diff --git a/indra/newview/lllocalmesh.h b/indra/newview/vjlocalmesh.h similarity index 100% rename from indra/newview/lllocalmesh.h rename to indra/newview/vjlocalmesh.h diff --git a/indra/newview/lllocalmeshimportdae.cpp b/indra/newview/vjlocalmeshimportdae.cpp similarity index 99% rename from indra/newview/lllocalmeshimportdae.cpp rename to indra/newview/vjlocalmeshimportdae.cpp index 74fa89e5c5..4541b73699 100644 --- a/indra/newview/lllocalmeshimportdae.cpp +++ b/indra/newview/vjlocalmeshimportdae.cpp @@ -28,8 +28,8 @@ #include "llviewerprecompiledheaders.h" /* own header */ -#include "lllocalmesh.h" -#include "lllocalmeshimportdae.h" +#include "vjlocalmesh.h" +#include "vjlocalmeshimportdae.h" /* linden headers */ #include "llmodelloader.h" diff --git a/indra/newview/lllocalmeshimportdae.h b/indra/newview/vjlocalmeshimportdae.h similarity index 100% rename from indra/newview/lllocalmeshimportdae.h rename to indra/newview/vjlocalmeshimportdae.h