diff options
| author | callum <none@none> | 2010-12-03 11:55:08 -0800 |
|---|---|---|
| committer | callum <none@none> | 2010-12-03 11:55:08 -0800 |
| commit | 6ec12a2cd9bc7ba6a8d8451fd8eb86ba43b2cd8c (patch) | |
| tree | d8ef6121c4d018de65bc06f70f92cec4d402d3d9 /indra/newview/llappviewer.cpp | |
| parent | 1c946e8e4dcb6a6fcdfafeca82d9ba1db9f09e54 (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
Merge after pull from viewer-development
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; |