From e3660b2fdf88f70a0c0f573523e7ef1c372e2c37 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 19 May 2011 00:19:12 -0500
Subject: Ported viewerinfo.cpp from Kokua.

It defines the ViewerInfo module/namespace, which contains a variety
of functions for querying the viewer name and version. It is designed
to be a replacement for viewerversion.cpp and viewerversion.xml.

viewerversion.cpp has been removed, but viewerversion.xml remains
(albeit with a bogus version number) until the packaging system no
longer uses it.
---
 linden/indra/llcommon/llversionviewer.h | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

(limited to 'linden/indra/llcommon/llversionviewer.h')

diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index ab74a3f..4162234 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/indra/llcommon/llversionviewer.h
@@ -33,8 +33,6 @@
 #ifndef LL_LLVERSIONVIEWER_H
 #define LL_LLVERSIONVIEWER_H
 
-// Version info should be accessed using newview\viewerversion.h -- MC
-
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 23;
 const S32 LL_VERSION_PATCH = 5;
@@ -42,17 +40,13 @@ const S32 LL_VERSION_BUILD = 136262;
 
 const char * const LL_VIEWER_NAME = "Second Life";
 
-// These aren't used anymore. 
-// The channel is ViewerChannelName in settings.xml
-// The Imprudence version is set in app_settings\viewerversion.xml -- MC
-
-/*const char * const LL_CHANNEL = "Imprudence";
-
-const char * const IMP_VIEWER_NAME = "Imprudence";
-
-const S32 IMP_VERSION_MAJOR = 1;
-const S32 IMP_VERSION_MINOR = 3;
-const S32 IMP_VERSION_PATCH = 0;
-const char * const IMP_VERSION_TEST = "beta 4";*/
+// These aren't used anymore. See newview/viewerinfo.cpp instead.
+//
+// const char * const LL_CHANNEL = "Imprudence";
+// const char * const IMP_VIEWER_NAME = "Imprudence";
+// const S32 IMP_VERSION_MAJOR = 0;
+// const S32 IMP_VERSION_MINOR = 0;
+// const S32 IMP_VERSION_PATCH = 0;
+// const char * const IMP_VERSION_TEST = "";
 
 #endif
-- 
cgit v1.1