summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterabout.cpp
diff options
context:
space:
mode:
authorTess Chu <tess@lindenlab.com>2007-08-10 02:15:37 +0000
committerTess Chu <tess@lindenlab.com>2007-08-10 02:15:37 +0000
commit3b2515fd5ff832fa5faa5384b2c3db919d960509 (patch)
tree0206223e8f0987dfe07c402c9ca99cee6685a849 /indra/newview/llfloaterabout.cpp
parent52cb2aea8667056671b67a3c70eeefd00a061751 (diff)
merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.
Added tests to version manager and fixed failed tests. Paired by rdw and Tess.
Diffstat (limited to 'indra/newview/llfloaterabout.cpp')
-rw-r--r--indra/newview/llfloaterabout.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llfloaterabout.cpp b/indra/newview/llfloaterabout.cpp
index ff7e8a41b7..8a51c155de 100644
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -21,7 +21,7 @@
#include "llagent.h"
#include "llviewerstats.h"
#include "llviewerregion.h"
-#include "llversion.h"
+#include "llversionviewer.h"
#include "llviewerbuild.h"
#include "llvieweruictrlfactory.h"
#include "viewer.h" // for gViewerDigest
@@ -89,7 +89,9 @@ LLFloaterAbout::LLFloaterAbout()
support.append(" (");
gAgent.getRegion()->getHost().getString(buffer, MAX_STRING);
support.append(buffer);
- support.append(")\n\n");
+ support.append(")\n");
+ support.append(gLastVersionChannel);
+ support.append("\n\n");
}
// CPU