diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index f95cfa7acbf03658093d31dd92ef17c5440af224..fa2c6c37e28a81ddd6ad86d0a229f8702c5b0319 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -45,8 +45,9 @@ #include "llviewerregion.h" #include "llversioninfo.h" #include "llweb.h" -// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.4.0a) -#include "rlvhandler.h" +// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.4.0) +#include "rlvactions.h" +#include "rlvhelper.h" // [/RLVa:KB] // Linden library includes @@ -283,8 +284,8 @@ LLSD LLFloaterAbout::getInfo() } #endif -// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.4.0a) | Added: RLVa-1.2.0e - info["RLV_VERSION"] = (rlv_handler_t::isEnabled()) ? RlvStrings::getVersionAbout() : "(disabled)"; +// [RLVa:KB] - Checked: 2010-04-18 (RLVa-1.2.0) + info["RLV_VERSION"] = (RlvActions::isRlvEnabled()) ? RlvStrings::getVersionAbout() : "(disabled)"; // [/RLVa:KB] info["OPENGL_VERSION"] = (const char*)(glGetString(GL_VERSION)); info["LIBCURL_VERSION"] = LLCurl::getVersionString(); @@ -429,7 +430,14 @@ void LLFloaterAbout::setSupportText(const std::string& server_release_notes_url) support << getString("AboutHeader", args); if (info.has("REGION")) { - support << "\n\n" << getString("AboutPosition", args); +// [RLVa:KB] - Checked: 2014-02-24 (RLVa-1.4.10) + support << "\n\n"; + if (RlvActions::canShowLocation()) + support << getString("AboutPosition", args); + else + support << RlvStrings::getString(RLV_STRING_HIDDEN_REGION); +// [/RLVa:KB] +// support << "\n\n" << getString("AboutPosition", args); } support << "\n\n" << getString("AboutSystem", args); support << "\n"; diff --git a/indra/newview/rlvactions.cpp b/indra/newview/rlvactions.cpp index 289e6172a12af18b82c12ca0364a3193e989e84d..a7b8d566c66d5bbb03a5de1526a2fdfea47802cf 100644 --- a/indra/newview/rlvactions.cpp +++ b/indra/newview/rlvactions.cpp @@ -91,6 +91,12 @@ bool RlvActions::canStand() return (!gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) || ((isAgentAvatarValid()) && (!gAgentAvatarp->isSitting())); } +// Checked: 2014-02-24 (RLVa-1.4.10) +bool RlvActions::canShowLocation() +{ + return !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC); +} + // Checked: 2013-05-10 (RLVa-1.4.9) bool RlvActions::hasBehaviour(ERlvBehaviour eBhvr) { diff --git a/indra/newview/rlvactions.h b/indra/newview/rlvactions.h index 9b77ed4b6afda0f9feca23e4c27b70c0e2cc18e9..58d90780a0b7418e90ada176b412821e8962e4a6 100644 --- a/indra/newview/rlvactions.h +++ b/indra/newview/rlvactions.h @@ -79,6 +79,11 @@ public: */ static bool canStand(); + /* + * Returns true if the user can see their in-world location + */ + static bool canShowLocation(); + // ================ // Helper functions // ================