Skip to content

Commit 68f7126

Browse files
brad-lindenbrad-linden
committed
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
 # Conflicts: # autobuild.xml # indra/newview/llvoicewebrtc.cpp
2 parents 9f7dd01 + 1d017b7 commit 68f7126

28 files changed

+356
-201
lines changed

‎autobuild.xml

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -749,18 +749,6 @@
749749
</map>
750750
<key>glm</key>
751751
<map>
752-
<key>canonical_repo</key>
753-
<string>https://github.com/secondlife/3p-glm</string>
754-
<key>copyright</key>
755-
<string>Copyright (c) 2005 - G-Truc Creation</string>
756-
<key>description</key>
757-
<string>OpenGL Mathematics</string>
758-
<key>license</key>
759-
<string>MIT</string>
760-
<key>license_file</key>
761-
<string>LICENSES/glm_license.txt</string>
762-
<key>name</key>
763-
<string>glm</string>
764752
<key>platforms</key>
765753
<map>
766754
<key>common</key>
@@ -778,16 +766,28 @@
778766
<string>common</string>
779767
</map>
780768
</map>
781-
<key>source_type</key>
782-
<string>git</string>
769+
<key>license</key>
770+
<string>MIT</string>
771+
<key>license_file</key>
772+
<string>LICENSES/glm_license.txt</string>
773+
<key>copyright</key>
774+
<string>Copyright (c) 2005 - G-Truc Creation</string>
775+
<key>version</key>
776+
<string>v1.0.1</string>
777+
<key>name</key>
778+
<string>glm</string>
783779
<key>vcs_branch</key>
784780
<string>refs/tags/v1.0.1-r1</string>
785781
<key>vcs_revision</key>
786782
<string>399cd5ba57a9267a560ce07e50a0f8c5fe3dc66f</string>
787783
<key>vcs_url</key>
788784
<string>git://github.com/secondlife/3p-glm.git</string>
789-
<key>version</key>
790-
<string>v1.0.1</string>
785+
<key>canonical_repo</key>
786+
<string>https://github.com/secondlife/3p-glm</string>
787+
<key>description</key>
788+
<string>OpenGL Mathematics</string>
789+
<key>source_type</key>
790+
<string>git</string>
791791
</map>
792792
<key>gstreamer</key>
793793
<map>
@@ -1426,14 +1426,6 @@
14261426
</map>
14271427
<key>llphysicsextensions_source</key>
14281428
<map>
1429-
<key>copyright</key>
1430-
<string>Copyright (c) 2010, Linden Research, Inc.</string>
1431-
<key>license</key>
1432-
<string>internal</string>
1433-
<key>license_file</key>
1434-
<string>LICENSES/llphysicsextensions.txt</string>
1435-
<key>name</key>
1436-
<string>llphysicsextensions_source</string>
14371429
<key>platforms</key>
14381430
<map>
14391431
<key>darwin64</key>
@@ -1485,8 +1477,16 @@
14851477
<string>windows64</string>
14861478
</map>
14871479
</map>
1480+
<key>license</key>
1481+
<string>internal</string>
1482+
<key>license_file</key>
1483+
<string>LICENSES/llphysicsextensions.txt</string>
1484+
<key>copyright</key>
1485+
<string>Copyright (c) 2010, Linden Research, Inc.</string>
14881486
<key>version</key>
14891487
<string>1.0.66e6919</string>
1488+
<key>name</key>
1489+
<string>llphysicsextensions_source</string>
14901490
</map>
14911491
<key>llphysicsextensions_stub</key>
14921492
<map>
@@ -2032,16 +2032,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
20322032
</map>
20332033
<key>openal</key>
20342034
<map>
2035-
<key>copyright</key>
2036-
<string>Copyright (C) 1999-2007 by authors.</string>
2037-
<key>description</key>
2038-
<string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
2039-
<key>license</key>
2040-
<string>LGPL2</string>
2041-
<key>license_file</key>
2042-
<string>LICENSES/openal-soft.txt</string>
2043-
<key>name</key>
2044-
<string>openal</string>
20452035
<key>platforms</key>
20462036
<map>
20472037
<key>darwin64</key>
@@ -2087,8 +2077,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
20872077
<string>windows64</string>
20882078
</map>
20892079
</map>
2080+
<key>license</key>
2081+
<string>LGPL2</string>
2082+
<key>license_file</key>
2083+
<string>LICENSES/openal-soft.txt</string>
2084+
<key>copyright</key>
2085+
<string>Copyright (C) 1999-2007 by authors.</string>
20902086
<key>version</key>
20912087
<string>1.23.1</string>
2088+
<key>name</key>
2089+
<string>openal</string>
2090+
<key>description</key>
2091+
<string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
20922092
</map>
20932093
<key>openjpeg</key>
20942094
<map>
@@ -2643,11 +2643,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
26432643
<key>archive</key>
26442644
<map>
26452645
<key>hash</key>
2646-
<string>baabb11f324be350253b1fb58cf262c1aa19fa70</string>
2646+
<string>3570b6442d472cd97bad8622c2ec2571d72218a0</string>
26472647
<key>hash_algorithm</key>
26482648
<string>sha1</string>
26492649
<key>url</key>
2650-
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.67-debug/webrtc-m114.5735.08.67-debug.10190042668-darwin64-10190042668.tar.zst</string>
2650+
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.72-test/webrtc-m114.5735.08.72-test.10444682919-darwin64-10444682919.tar.zst</string>
26512651
</map>
26522652
<key>name</key>
26532653
<string>darwin64</string>
@@ -2657,11 +2657,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
26572657
<key>archive</key>
26582658
<map>
26592659
<key>hash</key>
2660-
<string>a13776c8f99f8975665be66ff8b51a80ba46c718</string>
2660+
<string>eadf6aa99313940ded11801d42c11375669f1628</string>
26612661
<key>hash_algorithm</key>
26622662
<string>sha1</string>
26632663
<key>url</key>
2664-
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.67-debug/webrtc-m114.5735.08.67-debug.10190042668-linux64-10190042668.tar.zst</string>
2664+
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.72-test/webrtc-m114.5735.08.72-test.10444682919-linux64-10444682919.tar.zst</string>
26652665
</map>
26662666
<key>name</key>
26672667
<string>linux64</string>
@@ -2671,11 +2671,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
26712671
<key>archive</key>
26722672
<map>
26732673
<key>hash</key>
2674-
<string>965ef5d65a14191a52ee9ec6a9a8a1d2ce3f2ffb</string>
2674+
<string>0081fd35290adbc8e66dd366535fb6cd8a966f1e</string>
26752675
<key>hash_algorithm</key>
26762676
<string>sha1</string>
26772677
<key>url</key>
2678-
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.67-debug/webrtc-m114.5735.08.67-debug.10190042668-windows64-10190042668.tar.zst</string>
2678+
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.72-test/webrtc-m114.5735.08.72-test.10444682919-windows64-10444682919.tar.zst</string>
26792679
</map>
26802680
<key>name</key>
26812681
<string>windows64</string>
@@ -2688,7 +2688,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
26882688
<key>copyright</key>
26892689
<string>Copyright (c) 2011, The WebRTC project authors. All rights reserved.</string>
26902690
<key>version</key>
2691-
<string>m114.5735.08.67-debug.10190042668</string>
2691+
<string>m114.5735.08.72-test.10444682919</string>
26922692
<key>name</key>
26932693
<string>webrtc</string>
26942694
<key>vcs_branch</key>

‎indra/llcommon/lltracethreadrecorder.cpp

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ AccumulatorBufferGroup* ThreadRecorder::activate( AccumulatorBufferGroup* record
159159
ThreadRecorder::active_recording_list_t::iterator ThreadRecorder::bringUpToDate( AccumulatorBufferGroup* recording )
160160
{
161161
#if LL_TRACE_ENABLED
162-
if (mActiveRecordings.empty()) return mActiveRecordings.end();
162+
if (mActiveRecordings.empty())
163+
return mActiveRecordings.end();
163164

164165
mActiveRecordings.back()->mPartialRecording.sync();
165166
BlockTimer::updateTimes();
@@ -202,7 +203,7 @@ ThreadRecorder::active_recording_list_t::iterator ThreadRecorder::bringUpToDate(
202203
#endif
203204
}
204205

205-
void ThreadRecorder::deactivate( AccumulatorBufferGroup* recording )
206+
void ThreadRecorder::deactivate(AccumulatorBufferGroup* recording)
206207
{
207208
#if LL_TRACE_ENABLED
208209
active_recording_list_t::iterator recording_it = bringUpToDate(recording);
@@ -228,9 +229,10 @@ void ThreadRecorder::deactivate( AccumulatorBufferGroup* recording )
228229
#endif
229230
}
230231

231-
ThreadRecorder::ActiveRecording::ActiveRecording( AccumulatorBufferGroup* target )
232+
ThreadRecorder::ActiveRecording::ActiveRecording(AccumulatorBufferGroup* target)
232233
: mTargetRecording(target)
233-
{}
234+
{
235+
}
234236

235237
void ThreadRecorder::ActiveRecording::movePartialToTarget()
236238
{
@@ -243,30 +245,30 @@ void ThreadRecorder::ActiveRecording::movePartialToTarget()
243245

244246

245247
// called by child thread
246-
void ThreadRecorder::addChildRecorder( class ThreadRecorder* child )
248+
void ThreadRecorder::addChildRecorder(ThreadRecorder* child)
247249
{
248250
#if LL_TRACE_ENABLED
249-
{ LLMutexLock lock(&mChildListMutex);
250-
mChildThreadRecorders.push_back(child);
251-
}
251+
LLMutexLock lock(&mChildListMutex);
252+
mChildThreadRecorders.push_back(child);
252253
#endif
253254
}
254255

255256
// called by child thread
256-
void ThreadRecorder::removeChildRecorder( class ThreadRecorder* child )
257+
void ThreadRecorder::removeChildRecorder(ThreadRecorder* child)
257258
{
258259
#if LL_TRACE_ENABLED
259-
{ LLMutexLock lock(&mChildListMutex);
260-
mChildThreadRecorders.remove(child);
261-
}
260+
LLMutexLock lock(&mChildListMutex);
261+
mChildThreadRecorders.remove(child);
262262
#endif
263263
}
264264

265265
void ThreadRecorder::pushToParent()
266266
{
267267
#if LL_TRACE_ENABLED
268-
{ LLMutexLock lock(&mSharedRecordingMutex);
269-
LLTrace::get_thread_recorder()->bringUpToDate(&mThreadRecordingBuffers);
268+
if (ThreadRecorder* recorder = LLTrace::get_thread_recorder())
269+
{
270+
LLMutexLock lock(&mSharedRecordingMutex);
271+
recorder->bringUpToDate(&mThreadRecordingBuffers);
270272
mSharedRecordingBuffers.append(mThreadRecordingBuffers);
271273
mThreadRecordingBuffers.reset();
272274
}
@@ -278,29 +280,26 @@ void ThreadRecorder::pullFromChildren()
278280
{
279281
#if LL_TRACE_ENABLED
280282
LL_PROFILE_ZONE_SCOPED_CATEGORY_STATS;
281-
if (mActiveRecordings.empty()) return;
282-
283-
{ LLMutexLock lock(&mChildListMutex);
284-
283+
if (!mActiveRecordings.empty())
284+
{
285+
LLMutexLock lock(&mChildListMutex);
285286
AccumulatorBufferGroup& target_recording_buffers = mActiveRecordings.back()->mPartialRecording;
286287
target_recording_buffers.sync();
287288
for (LLTrace::ThreadRecorder* rec : mChildThreadRecorders)
288-
{ LLMutexLock lock(&(rec->mSharedRecordingMutex));
289-
289+
{
290+
LLMutexLock lock(&(rec->mSharedRecordingMutex));
290291
target_recording_buffers.merge(rec->mSharedRecordingBuffers);
291292
rec->mSharedRecordingBuffers.reset();
292293
}
293294
}
294295
#endif
295296
}
296297

297-
298-
void set_master_thread_recorder( ThreadRecorder* recorder )
298+
void set_master_thread_recorder(ThreadRecorder* recorder)
299299
{
300300
sMasterThreadRecorder = recorder;
301301
}
302302

303-
304303
ThreadRecorder* get_master_thread_recorder()
305304
{
306305
return sMasterThreadRecorder;

‎indra/llmessage/message_string_table.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,3 @@ char* LLMessageStringTable::getString(const char *str)
8888
}
8989
return mString[hash_value];
9090
}
91-

‎indra/llui/llfloater.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,6 +1966,14 @@ void LLFloater::onClickClose( LLFloater* self )
19661966
self->onClickCloseBtn();
19671967
}
19681968

1969+
// static
1970+
void LLFloater::onClickClose(LLFloater* self, bool app_quitting)
1971+
{
1972+
if (!self)
1973+
return;
1974+
self->onClickCloseBtn(app_quitting);
1975+
}
1976+
19691977
void LLFloater::onClickCloseBtn(bool app_quitting)
19701978
{
19711979
closeFloater(false);

‎indra/llui/llfloater.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
363363
// }
364364

365365
static void onClickClose(LLFloater* floater);
366+
static void onClickClose(LLFloater* floater, bool app_quitting);
366367
static void onClickMinimize(LLFloater* floater);
367368
static void onClickTearOff(LLFloater* floater);
368369
static void onClickDock(LLFloater* floater);

‎indra/llwebrtc/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ add_library (llwebrtc SHARED ${llwebrtc_SOURCE_FILES})
3131
set_target_properties(llwebrtc PROPERTIES PUBLIC_HEADER llwebrtc.h)
3232

3333
if (WINDOWS)
34+
cmake_policy(SET CMP0091 NEW)
3435
set_target_properties(llwebrtc
3536
PROPERTIES
3637
LINK_FLAGS "/debug /LARGEADDRESSAWARE"
@@ -42,7 +43,10 @@ if (WINDOWS)
4243
wmcodecdspuuid
4344
msdmo
4445
strmiids
45-
iphlpapi)
46+
iphlpapi
47+
libcmt)
48+
# as the webrtc libraries are release, build this binary as release as well.
49+
target_compile_options(llwebrtc PRIVATE "/MT")
4650
if (USE_BUGSPLAT)
4751
set_target_properties(llwebrtc PROPERTIES PDB_OUTPUT_DIRECTORY "${SYMBOLS_STAGING_DIR}")
4852
endif (USE_BUGSPLAT)

0 commit comments

Comments
 (0)