diff options
| author | Jacek Antonelli | 2011-05-25 23:42:48 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2011-05-25 23:42:48 -0500 |
| commit | d57cb15edd7fc0b12945629aef518f0d340c2f5d (patch) | |
| tree | 867c4a793128976daf207a7d3624d25eaba76d72 /linden/indra/llcommon | |
| parent | Merge remote-tracking branch 'mccabe/1.4.0-fbeta-prefs_reorg' into next (diff) | |
| parent | Removed viewerversion.xml, since it's not used anymore. (diff) | |
| download | meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.zip meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.gz meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.bz2 meta-impy-d57cb15edd7fc0b12945629aef518f0d340c2f5d.tar.xz | |
Merge branch 'viewerinfo' into next
Diffstat (limited to 'linden/indra/llcommon')
| -rw-r--r-- | linden/indra/llcommon/llversionviewer.h | 22 |
1 files changed, 8 insertions, 14 deletions
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 @@ | |||
| 33 | #ifndef LL_LLVERSIONVIEWER_H | 33 | #ifndef LL_LLVERSIONVIEWER_H |
| 34 | #define LL_LLVERSIONVIEWER_H | 34 | #define LL_LLVERSIONVIEWER_H |
| 35 | 35 | ||
| 36 | // Version info should be accessed using newview\viewerversion.h -- MC | ||
| 37 | |||
| 38 | const S32 LL_VERSION_MAJOR = 1; | 36 | const S32 LL_VERSION_MAJOR = 1; |
| 39 | const S32 LL_VERSION_MINOR = 23; | 37 | const S32 LL_VERSION_MINOR = 23; |
| 40 | const S32 LL_VERSION_PATCH = 5; | 38 | const S32 LL_VERSION_PATCH = 5; |
| @@ -42,17 +40,13 @@ const S32 LL_VERSION_BUILD = 136262; | |||
| 42 | 40 | ||
| 43 | const char * const LL_VIEWER_NAME = "Second Life"; | 41 | const char * const LL_VIEWER_NAME = "Second Life"; |
| 44 | 42 | ||
| 45 | // These aren't used anymore. | 43 | // These aren't used anymore. See newview/viewerinfo.cpp instead. |
| 46 | // The channel is ViewerChannelName in settings.xml | 44 | // |
| 47 | // The Imprudence version is set in app_settings\viewerversion.xml -- MC | 45 | // const char * const LL_CHANNEL = "Imprudence"; |
| 48 | 46 | // const char * const IMP_VIEWER_NAME = "Imprudence"; | |
| 49 | /*const char * const LL_CHANNEL = "Imprudence"; | 47 | // const S32 IMP_VERSION_MAJOR = 0; |
| 50 | 48 | // const S32 IMP_VERSION_MINOR = 0; | |
| 51 | const char * const IMP_VIEWER_NAME = "Imprudence"; | 49 | // const S32 IMP_VERSION_PATCH = 0; |
| 52 | 50 | // const char * const IMP_VERSION_TEST = ""; | |
| 53 | const S32 IMP_VERSION_MAJOR = 1; | ||
| 54 | const S32 IMP_VERSION_MINOR = 3; | ||
| 55 | const S32 IMP_VERSION_PATCH = 0; | ||
| 56 | const char * const IMP_VERSION_TEST = "beta 4";*/ | ||
| 57 | 51 | ||
| 58 | #endif | 52 | #endif |