diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-12-14 02:47:44 +0200 |
commit | 4b98ae6e8a4c54fa70246beb5d7ff28a5590e819 (patch) | |
tree | 11e49d0cb85d8420ac614f039b32e5ec16202de3 /indra/llcommon/tests/wrapllerrs.h | |
parent | 0db9bcf21fd4b7172e8a35cdb2805ccdc736e273 (diff) | |
parent | 07ace73c49918ffb70e99c2239849eaaabc1fe45 (diff) |
Merge branch 'DRTVWR-587-maint-V' into DRTVWR-588-maint-W
# Conflicts:
# indra/newview/llspatialpartition.cpp
Diffstat (limited to 'indra/llcommon/tests/wrapllerrs.h')
-rw-r--r-- | indra/llcommon/tests/wrapllerrs.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcommon/tests/wrapllerrs.h b/indra/llcommon/tests/wrapllerrs.h index 3779fb41bc..d657b329bb 100644 --- a/indra/llcommon/tests/wrapllerrs.h +++ b/indra/llcommon/tests/wrapllerrs.h @@ -226,6 +226,11 @@ public: return boost::dynamic_pointer_cast<CaptureLogRecorder>(mRecorder)->streamto(out); } + friend inline std::ostream& operator<<(std::ostream& out, const CaptureLog& self) + { + return self.streamto(out); + } + private: LLError::FatalFunction mFatalFunction; LLError::SettingsStoragePtr mOldSettings; |