0b9ac4ee19
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llwindow/llwindowsdl2.cpp
2024-07-30 10:37:17 +02:00
73788b2c67
FIRE-34348: Update outdated tool tip for point lights
2024-07-30 10:31:13 +02:00
4eab7c2b1c
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-atlasaurus
2024-07-30 10:21:48 +02:00
c6c2a51e9c
Don't show negative amount of available memory in texture console
2024-07-30 10:20:07 +02:00
ff891ca38d
FIRE-34277 - particles are refusing to rez
...
Oddly, calling getPixelArea() before calcPixelArea() is correct. This makes no sense but things break if we don't!
2024-07-29 21:30:58 +01:00
80730d097a
Fix: Off by one level
2024-07-27 20:24:28 +01:00
21d6248a8c
Now we have the right binary, get the lib from the right place.
2024-07-27 18:14:11 +01:00
665d99934d
Firestorm not Firestorm.app and revert to Resources as per LL
2024-07-27 14:51:15 +01:00
8de3e13e53
Try setting executable to reference Contents/MacOS
2024-07-27 12:02:14 +01:00
612c91ade9
mac packaging: exit loop cleanly on hdi detach success
2024-07-27 11:57:38 +01:00
a8be72c2c3
Merge pull request #37 from FirestormViewer/prdoc
...
Move PR guidelines doc to doc folder
2024-07-27 12:02:04 +02:00
e157a2db35
Move PR guidelines doc to doc folder
2024-07-27 12:00:44 +02:00
ce536fd5f3
mac packaging: exit loop cleanly on hdi detach success
2024-07-27 08:13:14 +01:00
96b8a9ec52
Modify Firestorm.app embedded path.
...
Based on `http://qin.laya.com/tech_coding_help/dylib_linking.html ` (thanks Brad)
In the past, I tried this, but I think it failed to find the executable.
Given that the change needs to be made to the executable, this should have worked. Trying again, but this time with Contents folder in the right place.
2024-07-27 06:03:48 +01:00
fc3befebd9
Merge pull request #36 from MelodeyOwo/webrtc_alpha
...
Make Clang Happier
2024-07-27 01:34:58 +02:00
fff95dc0e8
Make Clang Happier
2024-07-26 18:08:09 -04:00
b33b06e133
Make version identification clearer for support teams
2024-07-26 14:31:24 +01:00
4ac9016a3a
Another tweak to get webrtc in the right place
2024-07-26 14:30:02 +01:00
977c5bf6a8
Merge remote-tracking branch 'Firestorm-atlasaurus/master' into webrtc_alpha
2024-07-26 14:29:00 +01:00
6c5231d56e
Fix broken callback initialization for PBR terrain panel
2024-07-26 15:20:37 +02:00
2ac43eccf3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-07-26 15:16:20 +02:00
cf3314340b
Fix broken texture panel when not using new layout
2024-07-26 15:16:07 +02:00
eeba1c7f66
Add missing subdir, suggested by Melodey
2024-07-25 21:19:51 +01:00
e894ceb6e0
Merge remote-tracking branch 'Firestorm-atlasaurus/master' into webrtc_alpha
2024-07-25 21:18:04 +01:00
9a86b315d9
Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
2024-07-25 18:38:21 +02:00
698d8450c0
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
2024-07-25 18:37:58 +02:00
a8d0ae79cf
Update German translation
2024-07-25 18:37:08 +02:00
035d3506dc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-07-25 18:34:11 +02:00
ed73208eb9
Merge remote-tracking branch 'origin/release/webrtc-voice' into release/2024.06-atlasaurus
2024-07-24 16:55:49 -07:00
aced6fe5da
Merge pull request #2092 from secondlife/brad/1451-voice-fonts-message
...
Improve error message notifying user that Voice Morph Effects are not supported
2024-07-24 15:14:13 -07:00
b289e0b3ad
Update expired cert in integration test
...
see fe8c976
2024-07-24 10:42:45 -07:00
baee0a8e07
Running out of ideas
2024-07-24 17:46:26 +01:00
152c32d312
remove inappropriate ignoretext usage as recommended in code review.
2024-07-24 09:29:41 -07:00
a2694e8511
Try this instead
2024-07-24 15:23:06 +01:00
92cf520253
Try to fix the packaging of webrtc on Mac
2024-07-24 13:41:28 +01:00
26a01ced9a
Improve error message notifying user that Voice Morph Effects are not supported
...
secondlife/viewer#1451
2024-07-23 17:32:59 -07:00
3dc98a1292
fire-34309 fire-34311 updated french (laurent bechir) and russian (romka swallowtail) translations
2024-07-20 13:20:42 +02:00
7d65940610
Mac build was failing due to undefined "executable"
...
Take the executable declaration code from upstream
2024-07-19 17:28:30 +01:00
69b405553f
Updated VRAM reporting logic on Linux
...
Modified the condition for using NVXMemInfo in LLWindowSDL. Now, it will only use accurate feedback onNVidia if there's no override being used.
2024-07-19 16:31:49 +01:00
5a50d6e5d6
More temporary BOOL hackery until we get a new lib
2024-07-19 15:57:34 +01:00
2a078c7ba4
Missing override for pedantic Clang
2024-07-19 11:32:27 +01:00
6f72927d09
Try a nasty hack to keep Mac happy
2024-07-19 10:48:01 +01:00
ec4ad10e1a
Use the default compiler version on Linux
2024-07-19 09:51:55 +01:00
6b30727d49
Merge remote-tracking branch 'Firestorm-atlasaurus/master' into webrtc_alpha
2024-07-19 09:47:22 +01:00
955e5c6cb4
Make this thing build
2024-07-19 10:07:36 +02:00
e6f7ed7a88
Merge branch 'master' into webrtc_alpha
2024-07-19 08:57:46 +01:00
b2e4ccbf26
Updated handling of unsupported primitive modes
...
Added a warning message and return false if prim->mMode is not of expected types.
2024-07-19 07:03:12 +01:00
afca69a93e
BOOL to bool
2024-07-19 06:50:22 +01:00
444b554a52
Merge pull request #32 from taladar/dangling_reference_to_temporary
...
annotate gcc 13 dangling reference to temporary errors so they are ignored
2024-07-19 04:04:35 +01:00
130c1955ca
Restore missing translations
2024-07-18 22:46:14 +02:00
Ansariel