diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 15:40:05 -0800 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-11-19 15:40:05 -0800 |
| commit | fd78866bcdf712aaefecfb74d7edaecb30c91b27 (patch) | |
| tree | 235398d36401c68fc841389bb11984d94d36d7db /indra/newview/llviewerstats.cpp | |
| parent | 3337ef16cee97e26b45aa07518d34d031bdc75fa (diff) | |
| parent | b6edd74775e07ce392b0a1785cfc61338c890dad (diff) | |
Merged latest lindenlab/viewer-development with mani_linden/viewer-development
Diffstat (limited to 'indra/newview/llviewerstats.cpp')
| -rw-r--r-- | indra/newview/llviewerstats.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewerstats.cpp b/indra/newview/llviewerstats.cpp index 46c78e2bb4..402f00c5e7 100644 --- a/indra/newview/llviewerstats.cpp +++ b/indra/newview/llviewerstats.cpp @@ -48,6 +48,7 @@ #include "llagent.h" #include "llagentcamera.h" #include "llviewercontrol.h" +#include "llversioninfo.h" #include "llfloatertools.h" #include "lldebugview.h" #include "llfasttimerview.h" @@ -749,7 +750,7 @@ void send_stats() // send fps only for time app spends in foreground agent["fps"] = (F32)gForegroundFrameCount / gForegroundTime.getElapsedTimeF32(); - agent["version"] = gCurrentVersion; + agent["version"] = LLVersionInfo::getVersionAndChannel(); std::string language = LLUI::getLanguage(); agent["language"] = language; |