diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2017-03-13 16:38:00 -0400 |
commit | 66de0c9965ff68bcb8cb60975fcffa45e2c6d74c (patch) | |
tree | e3fa6c87fe70e487b6fc6e94f6793b7638b568ea /indra/llcommon/llthread.cpp | |
parent | 49e114748fdb52599aaa141c2006198c48aa083b (diff) | |
parent | 17c8eadb3d89bc78019f0b50eb8b109f25616781 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/llcommon/llthread.cpp')
-rw-r--r-- | indra/llcommon/llthread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthread.cpp b/indra/llcommon/llthread.cpp index c3f235c6ee..52255bfaeb 100644 --- a/indra/llcommon/llthread.cpp +++ b/indra/llcommon/llthread.cpp @@ -63,7 +63,7 @@ void set_thread_name( DWORD dwThreadID, const char* threadName) __try { - ::RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(DWORD), (DWORD*)&info ); + ::RaiseException( MS_VC_EXCEPTION, 0, sizeof(info)/sizeof(DWORD), (ULONG_PTR*)&info ); } __except(EXCEPTION_CONTINUE_EXECUTION) { |