diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 15:32:12 -0500 |
| commit | b8a925ec71f2a4483476e363428c5656702b1f19 (patch) | |
| tree | 117c4b884d8fd1e79e8f64184e62ea453d82a990 /indra/newview/llappviewer.cpp | |
| parent | 23031612745c7f1094a77252b24039333420b8c5 (diff) | |
| parent | 90a365ed2f13612d267a4eed9b54bd1b62edb7d5 (diff) | |
merge fix for STORM-584
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index b6f52e3e15..6c07974f69 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -906,7 +906,7 @@ bool LLAppViewer::init() // Save the current version to the prefs file gSavedSettings.setString("LastRunVersion", - LLVersionInfo::getVersionAndChannel()); + LLVersionInfo::getChannelAndVersion()); gSimLastTime = gRenderStartTime.getElapsedTimeF32(); gSimFrames = (F32)gFrameCount; |