merge -r 66233:67472 svn+ssh://svn/svn/linden/branches/het-grid-4 Paired by Tess and Leyla.

Added tests to version manager and fixed failed tests.  Paired by rdw and Tess.

2 files changed, 39 insertions, 0 deletions

diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
new file mode 100644
index 0000000000..f1bcacbd86
--- /dev/null
+++ b/indra/llcommon/llversionserver.h
@@ -0,0 +1,20 @@
+/** 
+ * @file llversionserver.h
+ * @brief
+ *
+ * Copyright (c) 2002-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LL_LLVERSIONSERVER_H
+#define LL_LLVERSIONSERVER_H
+
+const S32 LL_VERSION_MAJOR = 1;
+const S32 LL_VERSION_MINOR = 18;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 1;
+
+const char * const LL_CHANNEL = "Second Life Server";
+
+
+#endif
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
new file mode 100644
index 0000000000..e5c560f024
--- /dev/null
+++ b/indra/llcommon/llversionviewer.h
@@ -0,0 +1,19 @@
+/** 
+ * @file llversionviewer.h
+ * @brief
+ *
+ * Copyright (c) 2002-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LL_LLVERSIONVIEWER_H
+#define LL_LLVERSIONVIEWER_H
+
+const S32 LL_VERSION_MAJOR = 1;
+const S32 LL_VERSION_MINOR = 18;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 1;
+
+const char * const LL_CHANNEL = "Second Life Release";
+
+#endif