From 64f8d097dda294127891e2af56952ea1f575d7bb Mon Sep 17 00:00:00 2001 From: Northspring Date: Mon, 20 Apr 2015 16:06:06 +0200 Subject: [PATCH] A follow-up for commit 3f6362d50f01 - try to not exceed IM length limit in sysinfo2 and move few records to sysinfo1 --- indra/newview/fsdata.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index 9b74f78cb2..2a97ef6b10 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -954,20 +954,20 @@ LLSD FSData::getSystemInfo() // sysinfo1 += llformat("Build with %s version %s\n\n", info["COMPILER"].asString().c_str(), info["COMPILER_VERSION"].asString().c_str()); sysinfo1 += llformat("I am in %s located at %s (%s)\n", info["REGION"].asString().c_str(), info["HOSTNAME"].asString().c_str(), info["HOSTIP"].asString().c_str()); - sysinfo1 += llformat("%s\n", info["SERVER_VERSION"].asString().c_str()); + sysinfo1 += llformat("%s\n\n", info["SERVER_VERSION"].asString().c_str()); - std::string sysinfo2("\n"); - sysinfo2 += llformat("CPU: %s\n", info["CPU"].asString().c_str()); - sysinfo2 += llformat("Memory: %d MB\n", info["MEMORY_MB"].asInteger()); - sysinfo2 += llformat("OS: %s\n", info["OS_VERSION"].asString().c_str()); - sysinfo2 += llformat("Graphics Card Vendor: %s\n", info["GRAPHICS_CARD_VENDOR"].asString().c_str()); - sysinfo2 += llformat("Graphics Card: %s\n", info["GRAPHICS_CARD"].asString().c_str()); + sysinfo1 += llformat("CPU: %s\n", info["CPU"].asString().c_str()); + sysinfo1 += llformat("Memory: %d MB\n", info["MEMORY_MB"].asInteger()); + sysinfo1 += llformat("OS: %s\n", info["OS_VERSION"].asString().c_str()); + sysinfo1 += llformat("Graphics Card Vendor: %s\n", info["GRAPHICS_CARD_VENDOR"].asString().c_str()); + sysinfo1 += llformat("Graphics Card: %s\n", info["GRAPHICS_CARD"].asString().c_str()); if (info.has("GRAPHICS_DRIVER_VERSION")) { - sysinfo2 += llformat("Graphics Card Driver Version: %s\n", info["GRAPHICS_DRIVER_VERSION"].asString().c_str()); + sysinfo1 += llformat("Graphics Card Driver Version: %s\n", info["GRAPHICS_DRIVER_VERSION"].asString().c_str()); } + std::string sysinfo2("\n"); sysinfo2 += llformat("OpenGL Version: %s\n\n", info["OPENGL_VERSION"].asString().c_str()); sysinfo2 += llformat("libcurl Version: %s\n", info["LIBCURL_VERSION"].asString().c_str()); sysinfo2 += llformat("J2C Decoder Version: %s\n", info["J2C_VERSION"].asString().c_str());