livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72,989 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

235 Commits (a831237e29c650146b6870b568feddcda310ab29)

Author SHA1 Message Date
Zi Ree 485e9701b8 Remove unnecessary include and class forward declaration 2023-12-29 20:18:32 +01:00
Ansariel 4b923d4291 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.github/workflows/build.yaml
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llviewerregion.cpp
#	indra/newview/llviewerregion.h
 2023-08-24 20:48:55 +02:00
Ansariel 1847e2d9b9 Randomly replace some old code 2023-08-20 01:27:20 +02:00
Ansariel ffa21ae649 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-539 
# Conflicts:
#	autobuild.xml
#	indra/newview/app_settings/settings.xml
#	indra/newview/featuretable_linux.txt
#	indra/newview/fsfloaterperformance.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpool.cpp
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/lldrawpoolmaterials.cpp
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llperfstats.cpp
#	indra/newview/llperfstats.h
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/pipeline.cpp
 2023-04-28 00:39:47 +02:00
Ansariel 06ac6c615c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.gitignore
#	doc/contributions.txt
#	indra/cmake/FindOpenJPEG.cmake
#	indra/cmake/FreeType.cmake
#	indra/cmake/OpenJPEG.cmake
#	indra/cmake/UI.cmake
#	indra/cmake/ViewerMiscLibs.cmake
#	indra/llwindow/CMakeLists.txt
#	indra/newview/CMakeLists.txt
#	indra/newview/llviewercontrol.cpp
#	indra/newview/viewer_manifest.py
 2023-02-03 15:34:47 +01:00
Ansariel 73e5615d43 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llimagej2coj/llimagej2coj.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
#	indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
#	indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
#	indra/newview/llsettingsvo.cpp
 2023-02-03 11:11:13 +01:00
Ansariel f7063cecdd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	indra/llmath/llvolume.cpp
#	indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
#	indra/newview/llappviewer.cpp
#	indra/newview/lltexturefetch.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
 2022-12-14 10:13:07 +01:00
Ansariel 15f55c0a88 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappviewer.cpp
 2022-12-13 18:03:50 +01:00
Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloater360capture.cpp
 2022-12-12 22:09:54 +01:00
Ansariel 98f6ece775 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/lltexturectrl.cpp
#	indra/newview/llviewermenufile.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/panel_tools_texture.xml
 2022-12-02 19:19:40 +01:00
Andrey Kleshchev 7c489e0480 SL-18648 Clean up unused mNonImmediateFilterPermMask 2022-12-01 05:33:48 +02:00
Ansariel 7732257ea5 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-11-02 13:05:00 +01:00
Rye Mutt d0e07c770b Fix checks for empty LLSD maps to use size and not emptyMap which is for creating an empty LLSDMap type. 2022-10-30 06:56:16 -04:00
Ansariel e4816961a4 Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer 2022-10-22 16:53:15 +02:00
Andrey Kleshchev 664ce046ee SL-17628 Add viewer sided max attachment distance to position fields 2022-09-21 21:54:37 +03:00
Ansariel 9e32f64820 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-08-04 13:14:14 +02:00
Ansariel 8ba71585ba Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-30 18:57:37 +02:00
Ansariel 23cd48cce3 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 2022-06-30 18:15:30 +02:00
Andrey Lihatskiy a7c9ca8960 Merge branch 'master' into DRTVWR-561-maint-O 2022-06-29 20:32:13 +03:00
Andrey Kleshchev 48d2836ce6 SL-17436 Tools floater drops negative Z position for attachments 2022-06-24 22:07:18 +03:00
Ansariel 8e928652c7 Adjust LL standard LOD 2022-01-22 11:39:55 +01:00
Ansariel a0837a5298 Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-01-14 13:46:29 +01:00
Andrey Lihatskiy 9a1af101cd Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	indra/newview/llagentwearables.cpp
#	indra/newview/llvoicevivox.cpp
 2021-11-19 04:38:19 +02:00
Ansariel 7ff1f3100f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 14:37:06 +01:00
Andrey Lihatskiy 098c4c0371 Merge branch 'master' into DRTVWR-486 
# Conflicts:
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llpanelvolume.cpp
#	indra/newview/llpanelvolume.h
 2021-11-16 01:45:17 +02:00
Mnikolenko Productengine 9e4549117d SL-15887 FIXED Using Position buttons on an attachment that has a negative number for any position axii causes global position to be used 2021-08-27 17:29:09 +03:00
Ansariel 339c3c5df4 Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer 2021-01-18 18:55:37 +01:00
Mnikolenko Productengine 985502756f SL-14463 Don't show "Taper" prim parameter value when multiple prims are selected 2020-12-10 18:10:22 +02:00
Ansariel 9794df964b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-12-08 17:33:28 +01:00
Beq 084bac1807 FIRE-30500 - Overlapping text in build tool 
Ensure Mesh Info fields are hidden by default.
 2020-11-20 00:42:57 +00:00
Ansariel c7ba7678a9 Keep this in sync with master repo 2020-07-24 20:07:33 +02:00
Ansariel 7804982f52 Build fix 2020-07-24 13:02:17 +02:00
Ansariel 8bce76a8f9 Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer and keep a mix of best of both worlds for the newest cumbersome installment of copy%paste buttons 2020-06-22 18:31:01 +02:00
Andrey Kleshchev d95f86c593 SL-13359 #7 Features tab 2020-06-18 22:38:58 +03:00
Ansariel 3b2a98a083 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-06-18 13:28:17 +02:00
Ansariel 9f7cba9b55 When pasting object position take object's region width into account, not agent's region 2020-06-18 13:24:36 +02:00
Ansariel 57e0497fbf Include tags in log messages 2020-06-18 13:19:01 +02:00
Ansariel ec87508e9a Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer and keep the copy&paste options as they are without the latest cumbersome mess with even less functionality 2020-06-18 13:14:57 +02:00
Andrey Kleshchev 1310fac3b1 SL-13359 #5 Implemented revised changes 2020-06-17 23:39:42 +03:00
Andrey Kleshchev 30f1038351 SL-13359 #3 UI changes for panel object 2020-06-03 16:12:32 +03:00
Andrey Kleshchev f363646eb7 SL-13359 #2 UI changes for panel object 
todo: new icons, separator and some repositioning
 2020-06-02 21:54:47 +03:00
Andrey Kleshchev 090bb3e6de SL-13359 #1 Revert floater_tools and object panel changes 2020-06-02 16:58:28 +03:00
Ansariel b627c3d9c6 Clean up 2020-05-06 14:43:36 +02:00
Ansariel 728f7c50db Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer 2020-05-06 14:32:41 +02:00
Ansariel 66d385daff Sync with upstream changes from DRTVWR-486 2020-04-27 19:10:59 +02:00
Andrey Lihatskiy f4c7c8aff5 Post-merge build fixes 2020-04-26 21:15:54 +03:00
Ansariel 846d78345c Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer 2020-04-01 15:00:34 +02:00
Andrey Lihatskiy e77134ea89 Merge branch 'master' into DRTVWR-486 2020-03-18 21:07:30 +02:00
Ansariel 90cbec4a54 Merge DRTVWR-481 2020-02-08 18:43:22 +01:00
andreykproductengine eaa4e977d6 SL-12334 [Copypaste] Texture is not copied to clipboard from a full-perms object 2019-12-11 22:48:46 +02:00