aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/viewerinfo.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/viewerinfo.cpp
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.zip
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.gz
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.bz2
meta-impy-d056a17f05a1f90708f554651475e116a2ddbd68.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to 'linden/indra/newview/viewerinfo.cpp')
-rw-r--r--linden/indra/newview/viewerinfo.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
index 1762096..07ec740 100644
--- a/linden/indra/newview/viewerinfo.cpp
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -30,13 +30,15 @@ namespace ViewerInfo
30 30
31 // These are intentionally defined here instead of in the header, 31 // These are intentionally defined here instead of in the header,
32 // because they should NOT be read directly. Use the functions. 32 // because they should NOT be read directly. Use the functions.
33
34 // NOTE: Some parts of the build system scan this file looking for version numbers and such, commenting out sections confuses that.
33 const std::string NAME = "meta-impy"; 35 const std::string NAME = "meta-impy";
34 const std::string VARNT = ""; 36 const std::string VARNT = "";
35 const S32 MAJOR = 1; 37 const S32 MAJOR = 1;
36 const S32 MINOR = 4; 38 const S32 MINOR = 4;
37 const S32 PATCH = 0; 39 const S32 PATCH = 0;
38 const S32 RLEAS = 3; // increment for each beta/RC/release 40 const S32 RLEAS = 3; // increment for each beta/RC/release
39 const std::string EXTRA = "beta 2"; 41 const std::string EXTRA = "exp 1";
40 42
41 // Mac OS X bundle identifier. Should match the one in Info.plist. 43 // Mac OS X bundle identifier. Should match the one in Info.plist.
42 const std::string BUNDLE_ID = "org.imprudenceviewer.viewer"; 44 const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";