diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-12 17:05:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-12 17:05:23 +0300 |
commit | 9bc190c8d3ddd7a692636bb349952144fd511622 (patch) | |
tree | 07b0a9297a67667b5c85c4eb4950628e344c5106 /indra/llmessage | |
parent | f5a7fba76a24a96f906abcbd928f37e4eabfa76c (diff) | |
parent | eab5beb54cacc2b0dc2cddad4a78634e7468a298 (diff) |
Merge pull request #1211 from secondlife/marchcat/x-merge
Release (Maint W) -> Maint X merge
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/llxfer.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/indra/llmessage/llxfer.cpp b/indra/llmessage/llxfer.cpp index 93d5cfc131..212d0619d1 100644 --- a/indra/llmessage/llxfer.cpp +++ b/indra/llmessage/llxfer.cpp @@ -386,12 +386,3 @@ std::ostream& operator<< (std::ostream& os, LLXfer &hh) os << hh.getFileName() ; return os; } - - - - - - - - - |