diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-17 23:57:00 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-17 23:57:00 +0300 |
| commit | 082c9158b2ad961b747ca6a7bd55bc2a79f27b6a (patch) | |
| tree | 39200c1ff454ae23c8fd5b76e4c891d26f92c32c /indra/llmath/llcoordframe.cpp | |
| parent | 06a76eda6af9fbe36e40a749c44e590ad6cfe363 (diff) | |
| parent | c7ebde4ec9d3909c3c2f6503dc9096406297f26d (diff) | |
Merge branch 'develop' into marchcat/05-develop
# Conflicts:
# indra/llmath/v2math.cpp
# indra/llmath/v2math.h
# indra/llmath/v3math.h
# indra/llmath/v4math.h
Diffstat (limited to 'indra/llmath/llcoordframe.cpp')
| -rw-r--r-- | indra/llmath/llcoordframe.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmath/llcoordframe.cpp b/indra/llmath/llcoordframe.cpp index e0f4b2ff6b..b42541c7c0 100644 --- a/indra/llmath/llcoordframe.cpp +++ b/indra/llmath/llcoordframe.cpp @@ -26,7 +26,6 @@ #include "linden_common.h" -//#include "vmath.h" #include "v3math.h" #include "m3math.h" #include "v4math.h" |