Skip to content

Commit fc71a9c

Browse files
nat-goodspeednat-goodspeed
committed
Merge release/maint-yz to main on promotion of secondlife/viewer #736: Maintenance YZ 7.1.6.8745209917
2 parents a3cbd41 + 5e40b5e commit fc71a9c

File tree

203 files changed

+2307
-914
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

203 files changed

+2307
-914
lines changed

‎autobuild.xml‎

Lines changed: 52 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@
384384
<key>archive</key>
385385
<map>
386386
<key>hash</key>
387-
<string>f6835c4d7745cd1cadfbce47b40331d08affb532</string>
387+
<string>e03eb77224290c875ff84f75b7fe3d0e7c162c94</string>
388388
<key>hash_algorithm</key>
389389
<string>sha1</string>
390390
<key>url</key>
391-
<string>https://github.com/secondlife/3p-dictionaries/releases/download/v1.0.1-dev2.gf887629-f887629/dictionaries-common-None.tar.zst</string>
391+
<string>https://github.com/secondlife/3p-dictionaries/releases/download/v1-a01bb6c/dictionaries-1.a01bb6c-common-a01bb6c.tar.zst</string>
392392
</map>
393393
<key>name</key>
394394
<string>common</string>
@@ -401,7 +401,7 @@
401401
<key>copyright</key>
402402
<string>Copyright 2014 Apache OpenOffice software</string>
403403
<key>version</key>
404-
<string>None</string>
404+
<string>1.a01bb6c</string>
405405
<key>name</key>
406406
<string>dictionaries</string>
407407
<key>description</key>
@@ -568,11 +568,11 @@
568568
<key>creds</key>
569569
<string>github</string>
570570
<key>hash</key>
571-
<string>fb6797ff93b6e881b060d2a8b396d8d7477834ee</string>
571+
<string>a2074b67de7ad4c04b5ca8f8f161506add9697b2</string>
572572
<key>hash_algorithm</key>
573573
<string>sha1</string>
574574
<key>url</key>
575-
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908444</string>
575+
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207589</string>
576576
</map>
577577
<key>name</key>
578578
<string>darwin64</string>
@@ -584,11 +584,11 @@
584584
<key>creds</key>
585585
<string>github</string>
586586
<key>hash</key>
587-
<string>a378bd1604aa97ca763140911f9f4e463ced85c0</string>
587+
<string>8c1b701648c077220dbc576c3d9aefbef47f8324</string>
588588
<key>hash_algorithm</key>
589589
<string>sha1</string>
590590
<key>url</key>
591-
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908446</string>
591+
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207592</string>
592592
</map>
593593
<key>name</key>
594594
<string>linux64</string>
@@ -600,11 +600,11 @@
600600
<key>creds</key>
601601
<string>github</string>
602602
<key>hash</key>
603-
<string>72304491d86bd797b840999b255358f195b06609</string>
603+
<string>7e0c3d50e8b99d8735c6c9596a72ded9ee2bc1c8</string>
604604
<key>hash_algorithm</key>
605605
<string>sha1</string>
606606
<key>url</key>
607-
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/108908456</string>
607+
<string>https://api.github.com/repos/secondlife/3p-fmodstudio/releases/assets/149207594</string>
608608
</map>
609609
<key>name</key>
610610
<string>windows64</string>
@@ -617,7 +617,7 @@
617617
<key>copyright</key>
618618
<string>FMOD Studio by Firelight Technologies Pty Ltd.</string>
619619
<key>version</key>
620-
<string>2.02.13.578928</string>
620+
<string>2.02.20.c78ef55</string>
621621
<key>name</key>
622622
<string>fmodstudio</string>
623623
<key>description</key>
@@ -768,11 +768,11 @@
768768
<key>archive</key>
769769
<map>
770770
<key>hash</key>
771-
<string>6604c1cca515d287e697997a8d5593d1cae172a9</string>
771+
<string>066625e7aa7f697a4b6cd461aad960c57181011f</string>
772772
<key>hash_algorithm</key>
773773
<string>sha1</string>
774774
<key>url</key>
775-
<string>https://github.com/secondlife/3p-glh_linear/releases/download/v1.0.1-dev2.g3253ed7-3253ed7/glh_linear-common-None.tar.zst</string>
775+
<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>
776776
</map>
777777
<key>name</key>
778778
<string>common</string>
@@ -785,7 +785,7 @@
785785
<key>copyright</key>
786786
<string>Copyright (c) 2000 Cass Everitt</string>
787787
<key>version</key>
788-
<string>None</string>
788+
<string>1.0.1-dev4</string>
789789
<key>name</key>
790790
<string>glh_linear</string>
791791
<key>description</key>
@@ -904,11 +904,11 @@
904904
<key>creds</key>
905905
<string>github</string>
906906
<key>hash</key>
907-
<string>a193ff65d6db48626d65d96c6124c6efca85e8ec</string>
907+
<string>ae2c2a215b1bc2e3f37a67e301926dc405902d1a</string>
908908
<key>hash_algorithm</key>
909909
<string>sha1</string>
910910
<key>url</key>
911-
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912596</string>
911+
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778143</string>
912912
</map>
913913
<key>name</key>
914914
<string>darwin64</string>
@@ -932,11 +932,11 @@
932932
<key>creds</key>
933933
<string>github</string>
934934
<key>hash</key>
935-
<string>ebfb82b6143874e7938b9d1e8a70d0a2e28aa818</string>
935+
<string>0393dd75c58f7046bed47e62a8884a78cb02a5c3</string>
936936
<key>hash_algorithm</key>
937937
<string>sha1</string>
938938
<key>url</key>
939-
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/108912599</string>
939+
<string>https://api.github.com/repos/secondlife/3p-havok-source/releases/assets/136778145</string>
940940
</map>
941941
<key>name</key>
942942
<string>windows64</string>
@@ -1190,11 +1190,11 @@
11901190
<key>creds</key>
11911191
<string>github</string>
11921192
<key>hash</key>
1193-
<string>bcc7e2c34896fc9cbc41828dee8a4ddf54f10453</string>
1193+
<string>ad72fa1d103df777906f0d98f3e882b9916aeada</string>
11941194
<key>hash_algorithm</key>
11951195
<string>sha1</string>
11961196
<key>url</key>
1197-
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298968</string>
1197+
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774118</string>
11981198
</map>
11991199
<key>name</key>
12001200
<string>darwin64</string>
@@ -1206,11 +1206,11 @@
12061206
<key>creds</key>
12071207
<string>github</string>
12081208
<key>hash</key>
1209-
<string>9de772df2ed12e9c742df6c90670c7cbbb9c93a6</string>
1209+
<string>e46e4ac93a237b5c4a14183766f76ba5d58935a2</string>
12101210
<key>hash_algorithm</key>
12111211
<string>sha1</string>
12121212
<key>url</key>
1213-
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298969</string>
1213+
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774125</string>
12141214
</map>
12151215
<key>name</key>
12161216
<string>linux64</string>
@@ -1222,15 +1222,31 @@
12221222
<key>creds</key>
12231223
<string>github</string>
12241224
<key>hash</key>
1225-
<string>92533ff0f8c1881ad85e75800f9072c413ccf7b7</string>
1225+
<string>bb37557f78c72b26580a521f8b8dabfa1b34e6e6</string>
12261226
<key>hash_algorithm</key>
12271227
<string>sha1</string>
12281228
<key>url</key>
1229-
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/108298970</string>
1229+
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774126</string>
12301230
</map>
12311231
<key>name</key>
12321232
<string>windows64</string>
12331233
</map>
1234+
<key>linux</key>
1235+
<map>
1236+
<key>archive</key>
1237+
<map>
1238+
<key>creds</key>
1239+
<string>github</string>
1240+
<key>hash</key>
1241+
<string>711b82f9f588d3a125af7dcd8c81f93d9c343a7d</string>
1242+
<key>hash_algorithm</key>
1243+
<string>sha1</string>
1244+
<key>url</key>
1245+
<string>https://api.github.com/repos/secondlife/3p-kdu/releases/assets/136774121</string>
1246+
</map>
1247+
<key>name</key>
1248+
<string>linux</string>
1249+
</map>
12341250
</map>
12351251
<key>license</key>
12361252
<string>Kakadu</string>
@@ -1239,7 +1255,7 @@
12391255
<key>copyright</key>
12401256
<string>Kakadu software</string>
12411257
<key>version</key>
1242-
<string>7.10.4.539108</string>
1258+
<string>7.10.4.4b9ec5f</string>
12431259
<key>name</key>
12441260
<string>kdu</string>
12451261
<key>description</key>
@@ -1531,34 +1547,34 @@
15311547
</map>
15321548
<key>llca</key>
15331549
<map>
1550+
<key>copyright</key>
1551+
<string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
1552+
</string>
1553+
<key>license</key>
1554+
<string>mit</string>
1555+
<key>license_file</key>
1556+
<string>LICENSES/ca-license.txt</string>
1557+
<key>name</key>
1558+
<string>llca</string>
15341559
<key>platforms</key>
15351560
<map>
15361561
<key>common</key>
15371562
<map>
15381563
<key>archive</key>
15391564
<map>
15401565
<key>hash</key>
1541-
<string>3a3e14563cd5fc019c3f139b82aa46ec79847709</string>
1566+
<string>a9503e1b4e1d9790cf29d18a3d9ab39e6a515679</string>
15421567
<key>hash_algorithm</key>
15431568
<string>sha1</string>
15441569
<key>url</key>
1545-
<string>https://github.com/secondlife/llca/releases/download/v202312051403.17-0f5d9c3/llca-202312051404.0-common-0f5d9c3.tar.zst</string>
1570+
<string>https://github.com/secondlife/llca/releases/download/v202402012004.0-0f5d9c3/llca-202402012004.0-common-0f5d9c3.tar.zst</string>
15461571
</map>
15471572
<key>name</key>
15481573
<string>common</string>
15491574
</map>
15501575
</map>
1551-
<key>license</key>
1552-
<string>mit</string>
1553-
<key>license_file</key>
1554-
<string>LICENSES/ca-license.txt</string>
1555-
<key>copyright</key>
1556-
<string>Copyright (c) 2016, Linden Research, Inc.; data provided by the Mozilla NSS Project.
1557-
</string>
15581576
<key>version</key>
1559-
<string>202312051404.0</string>
1560-
<key>name</key>
1561-
<string>llca</string>
1577+
<string>202402012004.0</string>
15621578
</map>
15631579
<key>llphysicsextensions_source</key>
15641580
<map>

‎doc/contributions.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,8 @@ Aimee Trescothick
6464
VWR-14711
6565
VWR-14712
6666
VWR-15454
67+
AiraYumi
68+
SL-20781 (github PR #613)
6769
Alejandro Rosenthal
6870
VWR-1184
6971
Aleric Inglewood
@@ -847,6 +849,7 @@ Kadah Coba
847849
Jondan Lundquist
848850
Joosten Briebers
849851
MAINT-7074
852+
BUG-225288
850853
Josef Munster
851854
Josette Windlow
852855
Juilan Tripsa

‎indra/llappearance/llavatarappearance.cpp‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,6 @@
2424
* $/LicenseInfo$
2525
*/
2626

27-
#if LL_MSVC
28-
// disable warning about boost::lexical_cast returning uninitialized data
29-
// when it fails to parse the string
30-
#pragma warning (disable:4701)
31-
#endif
32-
3327
#include "linden_common.h"
3428

3529
#include "llavatarappearance.h"
@@ -46,14 +40,6 @@
4640
#include "boost/bind.hpp"
4741
#include "boost/tokenizer.hpp"
4842

49-
50-
#if LL_MSVC
51-
// disable boost::lexical_cast warning
52-
#pragma warning (disable:4702)
53-
#endif
54-
55-
#include <boost/lexical_cast.hpp>
56-
5743
using namespace LLAvatarAppearanceDefines;
5844

5945
//-----------------------------------------------------------------------------
@@ -230,7 +216,7 @@ void LLAvatarAppearance::initInstance()
230216
for (U32 lod = 0; lod < mesh_dict->mLOD; lod++)
231217
{
232218
LLAvatarJointMesh* mesh = createAvatarJointMesh();
233-
std::string mesh_name = "m" + mesh_dict->mName + boost::lexical_cast<std::string>(lod);
219+
std::string mesh_name = "m" + mesh_dict->mName + std::to_string(lod);
234220
// We pre-pended an m - need to capitalize first character for camelCase
235221
mesh_name[1] = toupper(mesh_name[1]);
236222
mesh->setName(mesh_name);

‎indra/llaudio/llaudioengine.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ void LLAudioEngine::idle()
398398
for (source_map::value_type& src_pair : mAllSources)
399399
{
400400
LLAudioSource *sourcep = src_pair.second;
401-
if (sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
401+
if (!sourcep->isMuted() && sourcep->isSyncMaster() && sourcep->getPriority() > max_sm_priority)
402402
{
403403
sync_masterp = sourcep;
404404
master_channelp = sync_masterp->getChannel();

‎indra/llcommon/lldoubledispatch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ class LLDoubleDispatch
255255
};
256256

257257
/// shared_ptr manages Entry lifespan for us
258-
typedef boost::shared_ptr<EntryBase> EntryPtr;
258+
typedef std::shared_ptr<EntryBase> EntryPtr;
259259
/// use a @c list to make it easy to insert
260260
typedef std::list<EntryPtr> DispatchTable;
261261
DispatchTable mDispatch;

‎indra/llcommon/llerror.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ namespace LLError
10701070
//
10711071
// NOTE!!! Requires external mutex lock!!!
10721072
template <typename RECORDER>
1073-
std::pair<boost::shared_ptr<RECORDER>, Recorders::iterator>
1073+
std::pair<std::shared_ptr<RECORDER>, Recorders::iterator>
10741074
findRecorderPos(SettingsConfigPtr &s)
10751075
{
10761076
// Since we promise to return an iterator, use a classic iterator
@@ -1081,7 +1081,7 @@ namespace LLError
10811081
// *it is a RecorderPtr, a shared_ptr<Recorder>. Use a
10821082
// dynamic_pointer_cast to try to downcast to test if it's also a
10831083
// shared_ptr<RECORDER>.
1084-
auto ptr = boost::dynamic_pointer_cast<RECORDER>(*it);
1084+
auto ptr = std::dynamic_pointer_cast<RECORDER>(*it);
10851085
if (ptr)
10861086
{
10871087
// found the entry we want
@@ -1101,7 +1101,7 @@ namespace LLError
11011101
// shared_ptr might be empty (operator!() returns true) if there was no
11021102
// such RECORDER subclass instance in mRecorders.
11031103
template <typename RECORDER>
1104-
boost::shared_ptr<RECORDER> findRecorder()
1104+
std::shared_ptr<RECORDER> findRecorder()
11051105
{
11061106
SettingsConfigPtr s = Globals::getInstance()->getSettingsConfig();
11071107
LLMutexLock lock(&s->mRecorderMutex);
@@ -1134,7 +1134,7 @@ namespace LLError
11341134

11351135
if (!file_name.empty())
11361136
{
1137-
boost::shared_ptr<RecordToFile> recordToFile(new RecordToFile(file_name));
1137+
std::shared_ptr<RecordToFile> recordToFile(new RecordToFile(file_name));
11381138
if (recordToFile->okay())
11391139
{
11401140
addRecorder(recordToFile);

‎indra/llcommon/llerrorcontrol.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ namespace LLError
174174
bool mWantsMultiline;
175175
};
176176

177-
typedef boost::shared_ptr<Recorder> RecorderPtr;
177+
typedef std::shared_ptr<Recorder> RecorderPtr;
178178

179179
/**
180180
* Instantiate GenericRecorder with a callable(level, message) to get

0 commit comments

Comments
 (0)