diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-08 18:31:52 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-10-08 18:31:52 +0300 |
| commit | b16ede862f3e1414eee044c5a2b49017706af943 (patch) | |
| tree | 5e223816b20f02185a487224d8dcc0dbf406142d /indra/llmath/raytrace.cpp | |
| parent | a301fb2876835f799317f8a011f368eaec4894d6 (diff) | |
| parent | a43b2106853b516248a2e657a28084b7d906cf5f (diff) | |
Merge branch 'develop' into marchcat/xcode-16
# Conflicts:
# .github/workflows/build.yaml
# indra/llmath/raytrace.cpp
Diffstat (limited to 'indra/llmath/raytrace.cpp')
| -rw-r--r-- | indra/llmath/raytrace.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmath/raytrace.cpp b/indra/llmath/raytrace.cpp index 1251ab9f8d..465e56b6f3 100644 --- a/indra/llmath/raytrace.cpp +++ b/indra/llmath/raytrace.cpp @@ -27,7 +27,6 @@ #include "linden_common.h" #include <cmath> -//#include "vmath.h" #include "v3math.h" #include "llquaternion.h" #include "m3math.h" |