diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 11:36:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-23 11:36:50 -0400 |
| commit | 8bcff54654f9ec98d166dabd38180be63dc8837c (patch) | |
| tree | 65d1744531195f7ec3bd8eee000928dcd8ca62a9 /indra/llmath | |
| parent | 4af7cd51e9cc22d9dc2fe42e378051c55515ac8e (diff) | |
| parent | db013ab0cb7dafb964b149a36b6963770f7427e5 (diff) | |
Merge remote branch 'develop'into release/luau-scripting
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/llrigginginfo.h | 4 | ||||
| -rw-r--r-- | indra/llmath/llsdutil_math.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/llmath/llrigginginfo.h b/indra/llmath/llrigginginfo.h index fb550d013f..d761af68b1 100644 --- a/indra/llmath/llrigginginfo.h +++ b/indra/llmath/llrigginginfo.h @@ -66,6 +66,10 @@ public: const LLJointRiggingInfo& operator[](S32 i) const { return mRigInfoPtr[i]; }; bool needsUpdate() { return mNeedsUpdate; } void setNeedsUpdate(bool val) { mNeedsUpdate = val; } + + LLJointRiggingInfo* begin() { return mRigInfoPtr; } + LLJointRiggingInfo* end() { return mRigInfoPtr + mSize; } + private: // Not implemented LLJointRiggingInfoTab& operator=(const LLJointRiggingInfoTab& src); diff --git a/indra/llmath/llsdutil_math.cpp b/indra/llmath/llsdutil_math.cpp index 0ea1a9c77a..2d5ec7d510 100644 --- a/indra/llmath/llsdutil_math.cpp +++ b/indra/llmath/llsdutil_math.cpp @@ -38,8 +38,7 @@ #include "v4color.h" #if LL_WINDOWS -# define WIN32_LEAN_AND_MEAN -# include <winsock2.h> // for htonl +# include "llwin32headers.h" // for htonl #elif LL_LINUX # include <netinet/in.h> #elif LL_DARWIN |