From ac5817fed1db39e1dd49a4a5ab35443a1bfe0d0c Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 18 Dec 2019 18:58:00 +0100 Subject: [PATCH 1/6] Make obsolete Merchant Outbox folder deletable --- indra/llinventory/llfoldertype.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp index b0daf639fa..66da7aab6d 100644 --- a/indra/llinventory/llfoldertype.cpp +++ b/indra/llinventory/llfoldertype.cpp @@ -92,7 +92,7 @@ LLFolderDictionary::LLFolderDictionary() addEntry(LLFolderType::FT_MESH, new FolderEntry("mesh", TRUE)); addEntry(LLFolderType::FT_INBOX, new FolderEntry("inbox", TRUE)); - addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", TRUE)); + addEntry(LLFolderType::FT_OUTBOX, new FolderEntry("outbox", FALSE)); // Make obsolete Merchant Outbox folder deletable addEntry(LLFolderType::FT_BASIC_ROOT, new FolderEntry("basic_rt", TRUE)); From cde80582c5d7657473500239904b831dfc845118 Mon Sep 17 00:00:00 2001 From: Beq Date: Sun, 22 Dec 2019 12:56:40 +0000 Subject: [PATCH 2/6] ignore my_autobuild.xml and .vscode detritus --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 784b7796d7..880dec30c6 100755 --- a/.gitignore +++ b/.gitignore @@ -85,4 +85,6 @@ indra/newview/avatar_lad.log indra/newview/pilot.txt indra/newview/pilot.xml #*.rej -.*\.wixobj \ No newline at end of file +.*\.wixobj +my_autobuild.xml +.vscode \ No newline at end of file From 315e0f6daedce11cda83b37d827a4c21e7cff03c Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 23 Dec 2019 10:56:01 +0000 Subject: [PATCH 3/6] Force a rebake on region upd if BOM support changes Persists last grid BOM support to force rebake across logins, hopefully this removes the black bakes --- indra/newview/app_settings/settings.xml | 13 +++++++++++++ indra/newview/llvoavatar.cpp | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 29f134eb67..8367b487a4 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3777,6 +3777,19 @@ Value 1 + CurrentlyUsingBakesOnMesh + + Comment + Are we currently on a grid that uses bakes on mesh? Persisted to force rebakes on login to named grids. + Persist + 1 + Type + Bool + Value + 1 + Backup + 0 + CurrentGrid Comment diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index a9a055baec..14715a5865 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -10770,8 +10770,15 @@ void LLVOAvatar::updateRegion(LLViewerRegion *regionp) { // BOM constrain number of bake requests when BOM not supported, // TEX_HEAD_TATTOO and BAKED_LEFT_ARM are the first new entries - // TODO(Beq): We might need to force some kind off rebake here? + sMaxBakes = gAgent.getRegion()->bakesOnMeshEnabled()?BAKED_NUM_INDICES:BAKED_LEFT_ARM; + if(!gSavedSettings.getBOOL("CurrentlyUsingBakesOnMesh") != getRegion()->bakesOnMeshEnabled()) + { + // force a rebake when the last grid we were on (including previous login) had different BOM support + // This replicates forceAppearanceUpdate rather than pulling in the whole of llavatarself. + doAfterInterval(boost::bind(&LLVOAvatarSelf::forceBakeAllTextures, gAgentAvatarp.get(), true), 5.0); + gSavedSettings.setBOOL("CurrentlyUsingBakesOnMesh", getRegion()->bakesOnMeshEnabled()); + } // LLViewerObject::updateRegion(regionp); } From 03eb842b4000bbe4373817136d9531ba194c828c Mon Sep 17 00:00:00 2001 From: Beq Date: Mon, 23 Dec 2019 14:22:41 +0000 Subject: [PATCH 4/6] Make the rebake explicitly OpenSim. Tracking needs to persist for SL->OS use case --- indra/newview/llvoavatar.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 14715a5865..e65898f014 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -10772,11 +10772,16 @@ void LLVOAvatar::updateRegion(LLViewerRegion *regionp) // TEX_HEAD_TATTOO and BAKED_LEFT_ARM are the first new entries sMaxBakes = gAgent.getRegion()->bakesOnMeshEnabled()?BAKED_NUM_INDICES:BAKED_LEFT_ARM; + if(!gSavedSettings.getBOOL("CurrentlyUsingBakesOnMesh") != getRegion()->bakesOnMeshEnabled()) { - // force a rebake when the last grid we were on (including previous login) had different BOM support - // This replicates forceAppearanceUpdate rather than pulling in the whole of llavatarself. - doAfterInterval(boost::bind(&LLVOAvatarSelf::forceBakeAllTextures, gAgentAvatarp.get(), true), 5.0); + // force a rebake when the last grid we were on (including previous login) had different BOM support + // This replicates forceAppearanceUpdate rather than pulling in the whole of llavatarself. + if(!LLGridManager::instance().isInSecondLife()) + { + doAfterInterval(boost::bind(&LLVOAvatarSelf::forceBakeAllTextures, gAgentAvatarp.get(), true), 5.0); + } + // update the setting even if we are in SL so that switch SL to OS and back gSavedSettings.setBOOL("CurrentlyUsingBakesOnMesh", getRegion()->bakesOnMeshEnabled()); } // From 2e809a6a9241003f228ea3d1bf25db94bdfc71c3 Mon Sep 17 00:00:00 2001 From: Beq Date: Wed, 25 Dec 2019 23:37:08 +0000 Subject: [PATCH 5/6] Bool is not an allowed type in Settings --- indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 8367b487a4..0d47172274 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3784,7 +3784,7 @@ Persist 1 Type - Bool + Boolean Value 1 Backup From 8e877cc02a994cf24f1d6e4019571704565148dc Mon Sep 17 00:00:00 2001 From: Nicky Date: Thu, 26 Dec 2019 02:14:45 +0100 Subject: [PATCH 6/6] Linux; Disable ndof_dump to be able to use built 3ps between vs2017 and non vs2017 branches. --- indra/newview/llviewerjoystick.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/indra/newview/llviewerjoystick.cpp b/indra/newview/llviewerjoystick.cpp index 0ac15dc9ea..8a84c44de4 100644 --- a/indra/newview/llviewerjoystick.cpp +++ b/indra/newview/llviewerjoystick.cpp @@ -114,7 +114,13 @@ NDOF_HotPlugResult LLViewerJoystick::HotPlugAddCallback(NDOF_Device *dev) if (joystick->mDriverState == JDS_UNINITIALIZED) { LL_INFOS() << "HotPlugAddCallback: will use device:" << LL_ENDL; + + // Disable for Linux till vs017 gets merged in to no having to support multiple version of libndofdev +#ifndef LL_LINUX ndof_dump(dev); +#endif + // + joystick->mNdofDev = dev; joystick->mDriverState = JDS_INITIALIZED; res = NDOF_KEEP_HOTPLUGGED; @@ -133,7 +139,13 @@ void LLViewerJoystick::HotPlugRemovalCallback(NDOF_Device *dev) { LL_INFOS() << "HotPlugRemovalCallback: joystick->mNdofDev=" << joystick->mNdofDev << "; removed device:" << LL_ENDL; + + // Disable for Linux till vs017 gets merged in to no having to support multiple version of libndofdev +#ifndef LL_LINUX ndof_dump(dev); +#endif + // + joystick->mDriverState = JDS_UNINITIALIZED; } joystick->updateEnabled(true);