Ansariel Hiller
a1bdef0c15
Fix rapidly triggering gestures can make them get stuck ( #2126 )
2024-07-27 18:10:08 +03:00
Ansariel Hiller
266553913f
Fix running multiple viewer instances stealing sound from first instance ( #2127 )
2024-07-27 18:09:58 +03:00
Beq
665d99934d
Firestorm not Firestorm.app and revert to Resources as per LL
2024-07-27 14:51:15 +01:00
Beq
8de3e13e53
Try setting executable to reference Contents/MacOS
2024-07-27 12:02:14 +01:00
Beq
612c91ade9
mac packaging: exit loop cleanly on hdi detach success
2024-07-27 11:57:38 +01:00
Ansariel Hiller
a8be72c2c3
Merge pull request #37 from FirestormViewer/prdoc
...
Move PR guidelines doc to doc folder
2024-07-27 12:02:04 +02:00
Ansariel
e157a2db35
Move PR guidelines doc to doc folder
2024-07-27 12:00:44 +02:00
Beq
ce536fd5f3
mac packaging: exit loop cleanly on hdi detach success
2024-07-27 08:13:14 +01:00
Beq
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
Ansariel Hiller
fc3befebd9
Merge pull request #36 from MelodeyOwo/webrtc_alpha
...
Make Clang Happier
2024-07-27 01:34:58 +02:00
MelodyOwo
fff95dc0e8
Make Clang Happier
2024-07-26 18:08:09 -04:00
Beq
b33b06e133
Make version identification clearer for support teams
2024-07-26 14:31:24 +01:00
Beq
4ac9016a3a
Another tweak to get webrtc in the right place
2024-07-26 14:30:02 +01:00
Beq
977c5bf6a8
Merge remote-tracking branch 'Firestorm-atlasaurus/master' into webrtc_alpha
2024-07-26 14:29:00 +01:00
Ansariel
6c5231d56e
Fix broken callback initialization for PBR terrain panel
2024-07-26 15:20:37 +02:00
Ansariel
2ac43eccf3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-07-26 15:16:20 +02:00
Ansariel
cf3314340b
Fix broken texture panel when not using new layout
2024-07-26 15:16:07 +02:00
Ansariel
346b8e0410
Fix a bunch of XUI parser warnings
2024-07-26 15:12:41 +02:00
Ansariel
9e0164e4fc
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llconsole.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelmaininventory.cpp
# indra/newview/llpaneloutfitedit.cpp
# indra/newview/llpaneloutfitedit.h
# indra/newview/llpanelpeople.cpp
# indra/newview/llwearableitemslist.cpp
# indra/newview/llworldmapview.cpp
2024-07-26 14:28:51 +02:00
Andrey Lihatskiy
42b1cedc85
Merge pull request #2116 from RyeMutt/fix-findchild-part2
...
Fix more findChild calls during draw and frequent data callbacks
2024-07-26 13:24:40 +03:00
Andrey Lihatskiy
a5d68b3801
Fix trailing whitespaces to make pre-commit happy
2024-07-26 13:21:27 +03:00
Rye Mutt
604cb4cb4d
Reduce utf8 to wstring conversion and llwstring temporaries during text draw ( #2115 )
2024-07-26 13:19:34 +03:00
Rye Mutt
dce1218b03
Fix findChild during draw in conversation log floater
2024-07-26 00:31:51 -04:00
Rye Mutt
99b4f1dd20
Fix some findChild stalls when swapping to/from wearable editors
2024-07-25 23:57:22 -04:00
Rye Mutt
543dbfee49
Reduce findChild stalls in face panel
2024-07-25 23:26:52 -04:00
Rye Mutt
1b47f82667
Reduce findChild stalls during inventory construction
2024-07-25 23:26:16 -04:00
Rye Mutt
10e5e56946
Reduce findChild stalls in appearance floater
2024-07-25 23:24:39 -04:00
Rye Mutt
005f3bd62a
Fix findChild stall during teleport in people panel
2024-07-25 21:29:08 -04:00
Beq
eeba1c7f66
Add missing subdir, suggested by Melodey
2024-07-25 21:19:51 +01:00
Beq
e894ceb6e0
Merge remote-tracking branch 'Firestorm-atlasaurus/master' into webrtc_alpha
2024-07-25 21:18:04 +01:00
Alexander Gavriliuk
bc50d2c7d5
#1318 Pagination in the Group Interface (rework)
2024-07-25 21:16:49 +02:00
Ansariel
db1a7eb9d0
Update German translation
2024-07-25 20:48:32 +02:00
Ansariel
450d02ad39
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# .github/ISSUE_TEMPLATE/10-bug.yaml
# indra/llui/lldockcontrol.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llviewereventrecorder.cpp
# indra/newview/llfloaterland.cpp
# indra/newview/llfloaterregioninfo.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelgroup.cpp
# indra/newview/llpanelgrouproles.cpp
# indra/newview/llpanelland.cpp
# indra/newview/llphysicsmotion.cpp
# indra/newview/lltexturectrl.h
# indra/newview/lltoolpie.cpp
# indra/newview/llviewermenu.cpp
2024-07-25 20:47:57 +02:00
Alexander Gavriliuk
4295a1f660
Fix commit 66d2c846b1
2024-07-25 20:00:37 +02:00
Alexander Gavriliuk
3ca9af4d4a
Fix commit 4b543b618b
2024-07-25 19:19:18 +02:00
Ansariel
460e12512c
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
2024-07-25 18:42:12 +02:00
Ansariel
79b2fa85d9
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llui/llfloaterreg.h
# indra/llwindow/llwindowsdl2.cpp
# indra/newview/llpathfindingnavmesh.cpp
2024-07-25 18:41:54 +02:00
Ansariel
9a86b315d9
Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer
2024-07-25 18:38:21 +02:00
Ansariel
698d8450c0
Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-webrtc-voice
2024-07-25 18:37:58 +02:00
Ansariel
a8d0ae79cf
Update German translation
2024-07-25 18:37:08 +02:00
Ansariel
035d3506dc
Merge branch 'release/webrtc-voice' of https://github.com/secondlife/viewer
2024-07-25 18:34:11 +02:00
Andrey Kleshchev
4d7f622a3c
viewer#2065 Region restart schedule floater
2024-07-25 16:02:03 +03:00
Andrey Lihatskiy
6e7c6a3842
Merge pull request #2099 from RyeMutt/fix-findchild-stutter
...
Fix various sources of stutter from findChild during draw
2024-07-25 15:51:34 +03:00
Rye Mutt
7bb62fff08
Fix precommit whitespace failure
2024-07-25 08:45:53 -04:00
Rye Mutt
6b20d98aaa
Fix one more group findChild stall
2024-07-25 08:45:53 -04:00
Rye Mutt
66d2c846b1
Fix further recursive findChild stalls from environment panel
2024-07-25 08:45:53 -04:00
Rye Mutt
a067f93535
Fix findChild calls during blocked list draw
2024-07-25 08:45:53 -04:00
Rye Mutt
e3deb8340a
Fix excessive findChild calls during about land floater draw
2024-07-25 08:45:53 -04:00
Rye Mutt
70f332d02e
Fix findChild during draw in the parcel/region environment panel
2024-07-25 08:45:53 -04:00
Rye Mutt
0a420e7d9a
Fix find child during draw in texture picker
2024-07-25 08:45:53 -04:00