From 70e752ac48b084229cb56658fddf165417521eba Mon Sep 17 00:00:00 2001 From: Kitty Barnett <develop@catznip.com> Date: Thu, 30 Oct 2014 01:12:26 +0200 Subject: [PATCH] - internal : restore RLVa version information on the about floater --HG-- branch : RLVa --- indra/newview/llappviewer.cpp | 39 ++++++++++++++----- indra/newview/llfloaterabout.cpp | 4 -- .../newview/skins/default/xui/en/strings.xml | 6 +++ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8504aa796cb..40523aff6fb 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -98,6 +98,7 @@ #include "llappearancemgr.h" // [/SL:KB] // [RLVa:KB] - Checked: 2010-05-03 (RLVa-1.2.0g) +#include "rlvactions.h" #include "rlvhandler.h" // [/RLVa:KB] @@ -3338,16 +3339,28 @@ LLSD LLAppViewer::getViewerInfo() const LLViewerRegion* region = gAgent.getRegion(); if (region) { - LLVector3d pos = gAgent.getPositionGlobal(); - info["POSITION"] = ll_sd_from_vector3d(pos); - info["POSITION_LOCAL"] = ll_sd_from_vector3(gAgent.getPosAgentFromGlobal(pos)); - info["REGION"] = gAgent.getRegion()->getName(); - info["HOSTNAME"] = gAgent.getRegion()->getHost().getHostName(); - info["HOSTIP"] = gAgent.getRegion()->getHost().getString(); +// [RLVa:KB] - Checked: 2014-02-24 (RLVa-1.4.10) + if (RlvActions::canShowLocation()) + { +// [/RLVa:KB] + LLVector3d pos = gAgent.getPositionGlobal(); + info["POSITION"] = ll_sd_from_vector3d(pos); + info["POSITION_LOCAL"] = ll_sd_from_vector3(gAgent.getPosAgentFromGlobal(pos)); + info["REGION"] = gAgent.getRegion()->getName(); + info["HOSTNAME"] = gAgent.getRegion()->getHost().getHostName(); + info["HOSTIP"] = gAgent.getRegion()->getHost().getString(); +// info["SERVER_VERSION"] = gLastVersionChannel; + LLSLURL slurl; + LLAgentUI::buildSLURL(slurl); + info["SLURL"] = slurl.getSLURLString(); +// [RLVa:KB] - Checked: 2014-02-24 (RLVa-1.4.10) + } + else + { + info["REGION"] = RlvStrings::getString(RLV_STRING_HIDDEN_REGION); + } info["SERVER_VERSION"] = gLastVersionChannel; - LLSLURL slurl; - LLAgentUI::buildSLURL(slurl); - info["SLURL"] = slurl.getSLURLString(); +// [/RLVa:KB] } // CPU @@ -3366,6 +3379,9 @@ LLSD LLAppViewer::getViewerInfo() const } #endif +// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.2.0) + info["RLV_VERSION"] = (rlv_handler_t::isEnabled()) ? RlvStrings::getVersionAbout() : "(disabled)"; +// [/RLVa:KB] info["OPENGL_VERSION"] = (const char*)(glGetString(GL_VERSION)); info["LIBCURL_VERSION"] = LLCurl::getVersionString(); info["J2C_VERSION"] = LLImageJ2C::getEngineInfo(); @@ -3455,7 +3471,10 @@ std::string LLAppViewer::getViewerInfoString() const support << LLTrans::getString("AboutHeader", args); if (info.has("REGION")) { - support << "\n\n" << LLTrans::getString("AboutPosition", args); +// [RLVa:KB] - Checked: 2014-02-24 (RLVa-1.4.10) + support << "\n\n" << LLTrans::getString( (RlvActions::canShowLocation()) ? "AboutPosition" : "AboutPositionRLVShowLoc", args); +// [/RLVa:KB] +// support << "\n\n" << LLTrans::getString("AboutPosition", args); } support << "\n\n" << LLTrans::getString("AboutSystem", args); support << "\n"; diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 6b9c65352e9..15b94034bb4 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -44,10 +44,6 @@ #include "llviewerregion.h" #include "llversioninfo.h" #include "llweb.h" -// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.4.0) -#include "rlvactions.h" -#include "rlvhelper.h" -// [/RLVa:KB] // Linden library includes #include "llaudioengine.h" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 67af688a8e9..0d2066adc23 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -31,6 +31,11 @@ You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_L SLURL: <nolink>[SLURL]</nolink> (global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) [SERVER_VERSION] +[SERVER_RELEASE_NOTES_URL] + </string> + <string name="AboutPositionRLVShowLoc"> +You are in [REGION] +[SERVER_VERSION] [SERVER_RELEASE_NOTES_URL] </string> <!-- *NOTE: Do not translate text like GPU, Graphics Card, etc - @@ -47,6 +52,7 @@ Graphics Card: [GRAPHICS_CARD] <string name="AboutLibs"> OpenGL Version: [OPENGL_VERSION] +RestrainedLove API: [RLV_VERSION] libcurl Version: [LIBCURL_VERSION] J2C Decoder Version: [J2C_VERSION] Audio Driver Version: [AUDIO_DRIVER_VERSION] -- GitLab