diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-10-24 17:48:16 -0700 |
| commit | 80585d56fd6ccb0875c6353c7620a8ada749d66d (patch) | |
| tree | 139699b14e49609532ca717f9086f2039795801e /indra/llwindow/llwindowmacosx.cpp | |
| parent | b0d69a20c262441125261c4949e59a8a1b9e9628 (diff) | |
| parent | e45b6159666b3aa271eaaa366fb4bcade2c2a28b (diff) | |
Merge master into DRTVWR-568 (and fix conflicts)
Diffstat (limited to 'indra/llwindow/llwindowmacosx.cpp')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 22a5462c7f..f7050bb588 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -1713,6 +1713,10 @@ void LLSplashScreenMacOSX::showImpl() void LLSplashScreenMacOSX::updateImpl(const std::string& mesg) { + if(mWindow != NULL) + { + CFStringCreateWithCString(NULL, mesg.c_str(), kCFStringEncodingUTF8); + } } |