Skip to content
Snippets Groups Projects
Commit 879dfd16 authored by Nat Goodspeed's avatar Nat Goodspeed
Browse files

CHOP-959: Re-add global coordinates, plus SLURL, to About box.

parent c71b02b7
No related branches found
No related tags found
No related merge requests found
...@@ -33,8 +33,10 @@ ...@@ -33,8 +33,10 @@
// Viewer includes // Viewer includes
#include "llagent.h" #include "llagent.h"
#include "llagentui.h"
#include "llappviewer.h" #include "llappviewer.h"
#include "llsecondlifeurls.h" #include "llsecondlifeurls.h"
#include "llslurl.h"
#include "llvoiceclient.h" #include "llvoiceclient.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
#include "llviewertexteditor.h" #include "llviewertexteditor.h"
...@@ -257,6 +259,9 @@ LLSD LLFloaterAbout::getInfo() ...@@ -257,6 +259,9 @@ LLSD LLFloaterAbout::getInfo()
info["HOSTNAME"] = gAgent.getRegion()->getHost().getHostName(); info["HOSTNAME"] = gAgent.getRegion()->getHost().getHostName();
info["HOSTIP"] = gAgent.getRegion()->getHost().getString(); info["HOSTIP"] = gAgent.getRegion()->getHost().getString();
info["SERVER_VERSION"] = gLastVersionChannel; info["SERVER_VERSION"] = gLastVersionChannel;
LLSLURL slurl;
LLAgentUI::buildSLURL(slurl);
info["SLURL"] = slurl.getSLURLString();
} }
// CPU // CPU
......
...@@ -23,6 +23,8 @@ Built with [COMPILER] version [COMPILER_VERSION] ...@@ -23,6 +23,8 @@ Built with [COMPILER] version [COMPILER_VERSION]
<floater.string <floater.string
name="AboutPosition"> name="AboutPosition">
You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP]) You are at [POSITION_LOCAL_0,number,1], [POSITION_LOCAL_1,number,1], [POSITION_LOCAL_2,number,1] in [REGION] located at &lt;nolink&gt;[HOSTNAME]&lt;/nolink&gt; ([HOSTIP])
SLURL: &lt;nolink&gt;[SLURL]&lt;/nolink&gt;
(global coordinates [POSITION_0,number,1], [POSITION_1,number,1], [POSITION_2,number,1])
[SERVER_VERSION] [SERVER_VERSION]
[SERVER_RELEASE_NOTES_URL] [SERVER_RELEASE_NOTES_URL]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment