diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-11 19:42:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-11 19:42:43 -0400 |
| commit | 879dfd161ef19f73371b69e5db6b044f8b118ca1 (patch) | |
| tree | a9d5c7497688ac5cc803d90f3e74c39b7c6076e9 /indra/newview | |
| parent | c71b02b743c41b00970425da14ceb437370aeaf8 (diff) | |
CHOP-959: Re-add global coordinates, plus SLURL, to About box.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llfloaterabout.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_about.xml | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp index 318a03f755..163f294d2a 100755 --- a/indra/newview/llfloaterabout.cpp +++ b/indra/newview/llfloaterabout.cpp @@ -33,8 +33,10 @@ // Viewer includes #include "llagent.h" +#include "llagentui.h" #include "llappviewer.h" #include "llsecondlifeurls.h" +#include "llslurl.h" #include "llvoiceclient.h" #include "lluictrlfactory.h" #include "llviewertexteditor.h" @@ -257,6 +259,9 @@ LLSD LLFloaterAbout::getInfo() 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 diff --git a/indra/newview/skins/default/xui/en/floater_about.xml b/indra/newview/skins/default/xui/en/floater_about.xml index d9e4b5b70c..703015af20 100755 --- a/indra/newview/skins/default/xui/en/floater_about.xml +++ b/indra/newview/skins/default/xui/en/floater_about.xml @@ -23,6 +23,8 @@ Built with [COMPILER] version [COMPILER_VERSION] <floater.string name="AboutPosition"> You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at <nolink>[HOSTNAME]</nolink> ([HOSTIP]) +SLURL: <nolink>[SLURL]</nolink> +(global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1]) [SERVER_VERSION] [SERVER_RELEASE_NOTES_URL] |