livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra/llmath
History
Ansariel 19347f7094 Fix merge issues: 
* Restore changes from 21947778ba to llwindow/llwindowwin32.cpp
* Restore changes from 3758618949 to newview/llinspecttexture.cpp
* Fix apparent merge error in LLInventoryPanel::itemChanged
* Restore changes from 1eeecfa1a8 in newview/llpaneloutfitsinventory.h
* Restore changes from b9633c17e3 in newview/llpaneloutfitsinventory.h & newview/llpanelwearing.cpp
* Restore changes from f660f1f0fd in newview/llviewertexture.cpp
* Restore changes from b9633c17e3 & 98f7d73d46 in newview/lloutfitgallery.cpp and newview/lloutfitslist.cpp
* Replace changes from 23729442aa with current implementation in develop branch
* Fix more broken changes in LLViewerTexture::saveRawImage
* Restore the changes in LLMath both from develop and maint-c
* Fix all kind of other merge errors

# Conflicts:
#	indra/llmath/v2math.h
#	indra/llmath/v3math.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/llfloaterobjectweights.h
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llvoavatar.cpp
 		2025-04-10 23:51:36 +03:00
..
tests Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed 2024-06-10 19:30:17 +03:00
CMakeLists.txt Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake 2022-09-16 23:15:49 +02:00
camera.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
coordframe.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llbbox.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llbbox.h Fix line endlings 2024-05-22 22:40:26 +03:00
llbboxlocal.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llbboxlocal.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llcalc.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llcalc.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llcalcparser.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llcalcparser.h Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
llcamera.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llcamera.h Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev 2024-05-23 11:31:19 -07:00
llcoord.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llcoordframe.cpp Merge commit '9e24b30' into marchcat/maint-c/restore 2025-04-10 06:01:50 +03:00
llcoordframe.h Fix line endlings 2024-05-22 22:40:26 +03:00
llinterp.h Fix line endlings 2024-05-22 22:40:26 +03:00
llline.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llline.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llmath.h Fix merge issues: 2025-04-10 23:51:36 +03:00
llmatrix3a.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llmatrix3a.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llmatrix3a.inl #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llmatrix4a.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llmatrix4a.h Merge remote-tracking branch 'origin/project/gltf_development' into brad/merge-maint-a-to-dev 2024-05-23 11:35:23 -07:00
llmodularmath.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llmodularmath.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
lloctree.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
lloctree.h Re-enable compiler warnings C4018, C4100, C4231 and C4506 2024-06-10 16:42:43 +02:00
llperlin.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llperlin.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llplane.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llquantize.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llquaternion.cpp Merge commit '9e24b30' into marchcat/maint-c/restore 2025-04-10 06:01:50 +03:00
llquaternion.h Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
llquaternion2.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llquaternion2.inl #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llrect.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llrect.h Fix line endlings 2024-05-22 22:40:26 +03:00
llrigginginfo.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llrigginginfo.h Profile guided optimization pass (#2582) 2024-09-16 18:49:03 -05:00
llsdutil_math.cpp Clean up Windows build (#2562) 2024-09-13 17:28:48 +03:00
llsdutil_math.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llsimdmath.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llsimdtypes.h Enable /permissive- on MSVC for better standards conformance (#2251) 2024-08-14 08:01:02 -07:00
llsimdtypes.inl #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llsphere.cpp Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
llsphere.h Fix line endlings 2024-05-22 22:40:26 +03:00
lltreenode.h Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings 2024-06-01 15:49:26 +02:00
llvector4a.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llvector4a.h Fix potential undefined behavior when converting to and from glm types from LLVector3/4 and fall back mul_mat4_vec3 to scalar implementation to attempt crash mitigation (#3339) 2025-01-23 18:40:19 -05:00
llvector4a.inl #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llvector4logical.h Fix a bunch of uninitialized variable warnings that showed up in Visual Studio 2024-05-30 15:41:36 +02:00
llvolume.cpp #3285 Crash at remapIndexBuffer 2024-12-13 21:07:05 +02:00
llvolume.h secondlife/viewer#2421: Do not calculate and store silhouette edges for nearly every geometric prim with a corner 2024-08-28 16:16:46 -07:00
llvolumemgr.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
llvolumemgr.h Fix line endlings 2024-05-22 22:40:26 +03:00
llvolumeoctree.cpp Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into project/gltf_development 2024-06-10 16:22:12 -07:00
llvolumeoctree.h Update tracy profiler to 0.10 (#1946) 2024-07-09 16:53:43 -05:00
m3math.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
m3math.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
m4math.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
m4math.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
raytrace.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
raytrace.h Fix line endlings 2024-05-22 22:40:26 +03:00
v2math.cpp Merge commit '9e24b30' into marchcat/maint-c/restore 2025-04-10 06:01:50 +03:00
v2math.h Fix merge issues: 2025-04-10 23:51:36 +03:00
v3color.cpp Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed 2024-06-10 19:30:17 +03:00
v3color.h Update boost to 1.85 and fix deprecation warnings 2024-07-29 08:20:32 +03:00
v3colorutil.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
v3dmath.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
v3dmath.h Fix line endlings 2024-05-22 22:40:26 +03:00
v3math.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
v3math.h Fix merge issues: 2025-04-10 23:51:36 +03:00
v4color.cpp Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed 2024-06-10 19:30:17 +03:00
v4color.h Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
v4coloru.cpp Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed 2024-06-10 19:30:17 +03:00
v4coloru.h Fix incorrect use of VX/VY/VZ/VW indices when color components are accessed 2024-06-10 19:30:17 +03:00
v4math.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
v4math.h Fix merge issues: 2025-04-10 23:51:36 +03:00
xform.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
xform.h Fix line endlings 2024-05-22 22:40:26 +03:00