diff options
| author | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-09 20:19:36 -0700 |
| commit | ddd9d1396cd378cbcd332d26d8b6b7092716c1bc (patch) | |
| tree | 767a40da9fdd2f3ae0c89b1d6cd5135884c4e8c9 /indra/newview/llfloaterabout.cpp | |
| parent | 21ab67416d471a90b343052c986478c9dd65ae79 (diff) | |
| parent | 52da9f5f49e0e300943abc3afa6944e6bee0cdd1 (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
| -rwxr-xr-x | indra/newview/llfloaterabout.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 7f81d40ebb..3288f90b88 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -33,7 +33,9 @@ // Viewer includes #include "llagent.h" +#include "llagentui.h" #include "llappviewer.h" +#include "llslurl.h" #include "llvoiceclient.h" #include "lluictrlfactory.h" #include "llviewertexteditor.h" @@ -249,12 +251,16 @@ LLSD LLFloaterAbout::getInfo() LLViewerRegion* region = gAgent.getRegion(); if (region) { - const LLVector3d &pos = gAgent.getPositionGlobal(); + 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(); } // CPU @@ -307,12 +313,12 @@ LLSD LLFloaterAbout::getInfo() static std::string get_viewer_release_notes_url() { // return a URL to the release notes for this viewer, such as: - // http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0 + // http://wiki.secondlife.com/wiki/Release_Notes/Second Life Beta Viewer/2.1.0.123456 std::string url = LLTrans::getString("RELEASE_NOTES_BASE_URL"); if (! LLStringUtil::endsWith(url, "/")) url += "/"; url += LLVersionInfo::getChannel() + "/"; - url += LLVersionInfo::getShortVersion(); + url += LLVersionInfo::getVersion(); return LLWeb::escapeURL(url); } |