diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-04-04 13:20:36 +0300 | 
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-04-04 13:20:36 +0300 | 
| commit | 5966831b0cc4f5abae63369d56d83d7cafb7810b (patch) | |
| tree | e03c3d166cba51d3c7a543154a91f215b05ac19c | |
| parent | 8a7e386696b73fe79d3d6b7f45812c4982be3370 (diff) | |
SL-10881 Add HiDPI status to Help - About Second Life report
| -rw-r--r-- | indra/newview/llappviewer.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 3 | 
2 files changed, 10 insertions, 0 deletions
| diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 577082f01f..7476ab1c5f 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -3173,6 +3173,10 @@ LLSD LLAppViewer::getViewerInfo() const      substitution["datetime"] = (S32)(gVFS ? gVFS->creationTime() : 0);      info["VFS_TIME"] = LLTrans::getString("AboutTime", substitution); +#if LL_DARWIN +    info["HIDPI"] = gHiDPISupport; +#endif +  	// Libraries  	info["J2C_VERSION"] = LLImageJ2C::getEngineInfo(); @@ -3315,6 +3319,9 @@ std::string LLAppViewer::getViewerInfoString(bool default_string) const  	}  	support << "\n" << LLTrans::getString("AboutOGL", args, default_string);  	support << "\n\n" << LLTrans::getString("AboutSettings", args, default_string); +#if LL_DARWIN +	support << "\n" << LLTrans::getString("AboutOSXHiDPI", args, default_string); +#endif  	support << "\n\n" << LLTrans::getString("AboutLibs", args, default_string);  	if (info.has("COMPILER"))  	{ diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index d91f3ac095..823109e55f 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -58,6 +58,9 @@ Advanced Lighting Model: [GPU_SHADERS]  Texture memory: [TEXTURE_MEMORY]MB  VFS (cache) creation time: [VFS_TIME]  	</string> +	<string name="AboutOSXHiDPI"> +HiDPI display mode: [HIDPI] +	</string>  	<string name="AboutLibs">  J2C Decoder Version: [J2C_VERSION]  Audio Driver Version: [AUDIO_DRIVER_VERSION] | 
