Skip to content

Commit

Permalink
Merge release/maint-yz to main on promotion of secondlife/viewer #736:…
Browse files Browse the repository at this point in the history 
… Maintenance YZ 7.1.6.8745209917
  • Loading branch information
@nat-goodspeed
nat-goodspeed committed Apr 24, 2024
2 parents a3cbd41 + 5e40b5e commit fc71a9c
Show file tree
Hide file tree
Showing 203 changed files with 2,307 additions and 914 deletions.
88 changes: 52 additions & 36 deletions autobuild.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,11 +384,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>f6835c4d7745cd1cadfbce47b40331d08affb532</string>
<string>e03eb77224290c875ff84f75b7fe3d0e7c162c94</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-dictionaries/releases/download/v1.0.1-dev2.gf887629-f887629/dictionaries-common-None.tar.zst</string>
<string>https://github.com/secondlife/3p-dictionaries/releases/download/v1-a01bb6c/dictionaries-1.a01bb6c-common-a01bb6c.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
Expand All @@ -401,7 +401,7 @@
<key>copyright</key>
<string>Copyright 2014 Apache OpenOffice software</string>
<key>version</key>
<string>None</string>
<string>1.a01bb6c</string>
<key>name</key>
<string>dictionaries</string>
<key>description</key>
Expand Down Expand Up @@ -568,11 +568,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>fb6797ff93b6e881b060d2a8b396d8d7477834ee</string>
<string>a2074b67de7ad4c04b5ca8f8f161506add9697b2</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908444</string>
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207589</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -584,11 +584,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>a378bd1604aa97ca763140911f9f4e463ced85c0</string>
<string>8c1b701648c077220dbc576c3d9aefbef47f8324</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908446</string>
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207592</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -600,11 +600,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>72304491d86bd797b840999b255358f195b06609</string>
<string>7e0c3d50e8b99d8735c6c9596a72ded9ee2bc1c8</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908456</string>
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207594</string>
</map>
<key>name</key>
<string>windows64</string>
Expand All @@ -617,7 +617,7 @@
<key>copyright</key>
<string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
<key>version</key>
<string>2.02.13.578928</string>
<string>2.02.20.c78ef55</string>
<key>name</key>
<string>fmodstudio</string>
<key>description</key>
Expand Down Expand Up @@ -768,11 +768,11 @@
<key>archive</key>
<map>
<key>hash</key>
<string>6604c1cca515d287e697997a8d5593d1cae172a9</string>
<string>066625e7aa7f697a4b6cd461aad960c57181011f</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev2.g3253ed7-3253ed7/glh_linear-common-None.tar.zst</string>
<string>https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev4-984c397/glh_linear-1.0.1-dev4-common-984c397.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
Expand All @@ -785,7 +785,7 @@
<key>copyright</key>
<string>Copyright (c) 2000 Cass Everitt</string>
<key>version</key>
<string>None</string>
<string>1.0.1-dev4</string>
<key>name</key>
<string>glh_linear</string>
<key>description</key>
Expand Down Expand Up @@ -904,11 +904,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>a193ff65d6db48626d65d96c6124c6efca85e8ec</string>
<string>ae2c2a215b1bc2e3f37a67e301926dc405902d1a</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912596</string>
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778143</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -932,11 +932,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>ebfb82b6143874e7938b9d1e8a70d0a2e28aa818</string>
<string>0393dd75c58f7046bed47e62a8884a78cb02a5c3</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599</string>
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778145</string>
</map>
<key>name</key>
<string>windows64</string>
Expand Down Expand Up @@ -1190,11 +1190,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>bcc7e2c34896fc9cbc41828dee8a4ddf54f10453</string>
<string>ad72fa1d103df777906f0d98f3e882b9916aeada</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298968</string>
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774118</string>
</map>
<key>name</key>
<string>darwin64</string>
Expand All @@ -1206,11 +1206,11 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>9de772df2ed12e9c742df6c90670c7cbbb9c93a6</string>
<string>e46e4ac93a237b5c4a14183766f76ba5d58935a2</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298969</string>
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774125</string>
</map>
<key>name</key>
<string>linux64</string>
Expand All @@ -1222,15 +1222,31 @@
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>92533ff0f8c1881ad85e75800f9072c413ccf7b7</string>
<string>bb37557f78c72b26580a521f8b8dabfa1b34e6e6</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298970</string>
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774126</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
<key>linux</key>
<map>
<key>archive</key>
<map>
<key>creds</key>
<string>github</string>
<key>hash</key>
<string>711b82f9f588d3a125af7dcd8c81f93d9c343a7d</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774121</string>
</map>
<key>name</key>
<string>linux</string>
</map>
</map>
<key>license</key>
<string>Kakadu</string>
Expand All @@ -1239,7 +1255,7 @@
<key>copyright</key>
<string>Kakadu software</string>
<key>version</key>
<string>7.10.4.539108</string>
<string>7.10.4.4b9ec5f</string>
<key>name</key>
<string>kdu</string>
<key>description</key>
Expand Down Expand Up @@ -1531,34 +1547,34 @@
</map>
<key>llca</key>
<map>
<key>copyright</key>
<string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
</string>
<key>license</key>
<string>mit</string>
<key>license_file</key>
<string>LICENSES/ca-license.txt</string>
<key>name</key>
<string>llca</string>
<key>platforms</key>
<map>
<key>common</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>3a3e14563cd5fc019c3f139b82aa46ec79847709</string>
<string>a9503e1b4e1d9790cf29d18a3d9ab39e6a515679</string>
<key>hash_algorithm</key>
<string>sha1</string>
<key>url</key>
<string>https://github.com/secondlife/llca/releases/download/v202312051403.17-0f5d9c3/llca-202312051404.0-common-0f5d9c3.tar.zst</string>
<string>https://github.com/secondlife/llca/releases/download/v202402012004.0-0f5d9c3/llca-202402012004.0-common-0f5d9c3.tar.zst</string>
</map>
<key>name</key>
<string>common</string>
</map>
</map>
<key>license</key>
<string>mit</string>
<key>license_file</key>
<string>LICENSES/ca-license.txt</string>
<key>copyright</key>
<string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
</string>
<key>version</key>
<string>202312051404.0</string>
<key>name</key>
<string>llca</string>
<string>202402012004.0</string>
</map>
<key>llphysicsextensions_source</key>
<map>
Expand Down
3 changes: 3 additions & 0 deletions doc/contributions.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ Aimee Trescothick
VWR-14711
VWR-14712
VWR-15454
AiraYumi
SL-20781 (github PR #613)
Alejandro Rosenthal
VWR-1184
Aleric Inglewood
Expand Down Expand Up @@ -847,6 +849,7 @@ Kadah Coba
Jondan Lundquist
Joosten Briebers
MAINT-7074
BUG-225288
Josef Munster
Josette Windlow
Juilan Tripsa
Expand Down
16 changes: 1 addition & 15 deletions indra/llappearance/llavatarappearance.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@
* $/LicenseInfo$
*/

#if LL_MSVC
// disable warning about boost::lexical_cast returning uninitialized data
// when it fails to parse the string
#pragma warning (disable:4701)
#endif

#include "linden_common.h"

#include "llavatarappearance.h"
Expand All @@ -46,14 +40,6 @@
#include "boost/bind.hpp"
#include "boost/tokenizer.hpp"


#if LL_MSVC
// disable boost::lexical_cast warning
#pragma warning (disable:4702)
#endif

#include <boost/lexical_cast.hpp>

using namespace LLAvatarAppearanceDefines;

//-----------------------------------------------------------------------------
Expand Down Expand Up @@ -230,7 +216,7 @@ void LLAvatarAppearance::initInstance()
for (U32 lod = 0; lod < mesh_dict->mLOD; lod++)
{
LLAvatarJointMesh* mesh = createAvatarJointMesh();
std::string mesh_name = "m" + mesh_dict->mName + boost::lexical_cast<std::string>(lod);
std::string mesh_name = "m" + mesh_dict->mName + std::to_string(lod);
// We pre-pended an m - need to capitalize first character for camelCase
mesh_name[1] = toupper(mesh_name[1]);
mesh->setName(mesh_name);
Expand Down
2 changes: 1 addition & 1 deletion indra/llaudio/llaudioengine.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ void LLAudioEngine::idle()
for (source_map::value_type& src_pair : mAllSources)
{
LLAudioSource *sourcep = src_pair.second;
if (sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
if (!sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
{
sync_masterp = sourcep;
master_channelp = sync_masterp->getChannel();
Expand Down
2 changes: 1 addition & 1 deletion indra/llcommon/lldoubledispatch.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ class LLDoubleDispatch
};

/// shared_ptr manages Entry lifespan for us
typedef boost::shared_ptr<EntryBase> EntryPtr;
typedef std::shared_ptr<EntryBase> EntryPtr;
/// use a @c list to make it easy to insert
typedef std::list<EntryPtr> DispatchTable;
DispatchTable mDispatch;
Expand Down
8 changes: 4 additions & 4 deletions indra/llcommon/llerror.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,7 @@ namespace LLError
//
// NOTE!!! Requires external mutex lock!!!
template <typename RECORDER>
std::pair<boost::shared_ptr<RECORDER>, Recorders::iterator>
std::pair<std::shared_ptr<RECORDER>, Recorders::iterator>
findRecorderPos(SettingsConfigPtr &s)
{
// Since we promise to return an iterator, use a classic iterator
Expand All @@ -1081,7 +1081,7 @@ namespace LLError
// *it is a RecorderPtr, a shared_ptr<Recorder>. Use a
// dynamic_pointer_cast to try to downcast to test if it's also a
// shared_ptr<RECORDER>.
auto ptr = boost::dynamic_pointer_cast<RECORDER>(*it);
auto ptr = std::dynamic_pointer_cast<RECORDER>(*it);
if (ptr)
{
// found the entry we want
Expand All @@ -1101,7 +1101,7 @@ namespace LLError
// shared_ptr might be empty (operator!() returns true) if there was no
// such RECORDER subclass instance in mRecorders.
template <typename RECORDER>
boost::shared_ptr<RECORDER> findRecorder()
std::shared_ptr<RECORDER> findRecorder()
{
SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
LLMutexLock lock(&s->mRecorderMutex);
Expand Down Expand Up @@ -1134,7 +1134,7 @@ namespace LLError

if (!file_name.empty())
{
boost::shared_ptr<RecordToFile> recordToFile(new RecordToFile(file_name));
std::shared_ptr<RecordToFile> recordToFile(new RecordToFile(file_name));
if (recordToFile->okay())
{
addRecorder(recordToFile);
Expand Down
2 changes: 1 addition & 1 deletion indra/llcommon/llerrorcontrol.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ namespace LLError
bool mWantsMultiline;
};

typedef boost::shared_ptr<Recorder> RecorderPtr;
typedef std::shared_ptr<Recorder> RecorderPtr;

/**
* Instantiate GenericRecorder with a callable(level, message) to get
Expand Down
Loading

0 comments on commit fc71a9c

Please sign in to comment.