From 706b885155ecd9081ff54a69ce5570eaa48d7e99 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 10 Jul 2013 13:16:58 +0200
Subject: [PATCH] More build fixes

---
 indra/llcommon/llversionserver.h              | 38 +++++++++++++++++++
 indra/newview/fsdata.cpp                      |  3 +-
 indra/newview/fslslpreproc.cpp                |  1 -
 .../res/{viewerRes.rc.in => viewerRes.rc}     |  0
 indra/newview/rlvcommon.cpp                   |  1 -
 5 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 indra/llcommon/llversionserver.h
 rename indra/newview/res/{viewerRes.rc.in => viewerRes.rc} (100%)

diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
new file mode 100644
index 0000000000..ef68a0eaf5
--- /dev/null
+++ b/indra/llcommon/llversionserver.h
@@ -0,0 +1,38 @@
+/** 
+ * @file llversionserver.h
+ * @brief
+ *
+ * $LicenseInfo:firstyear=2002&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ * 
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#ifndef LL_LLVERSIONSERVER_H
+#define LL_LLVERSIONSERVER_H
+
+const S32 LL_VERSION_MAJOR = 2;
+const S32 LL_VERSION_MINOR = 1;
+const S32 LL_VERSION_PATCH = 0;
+const S32 LL_VERSION_BUILD = 264760;
+
+const char * const LL_CHANNEL = "Second Life Server";
+
+
+#endif
diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index 99ecd599f3..6c4f78b03c 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -48,13 +48,12 @@
 #include "llprimitive.h"
 #include "llsdserialize.h"
 #include "llversioninfo.h"
-#include "llversionviewer.h"
 #include "llviewercontrol.h"
 #include "llviewermedia.h"
 #include "llviewernetwork.h"
 #include "llxorcipher.h"
 
-const std::string VERSION_ID = llformat("%s %d.%d.%d (%d)", LL_CHANNEL, LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD);
+const std::string VERSION_ID = llformat("%s %d.%d.%d (%d)", LLVersionInfo::getChannel(), LLVersionInfo::getMajor(), LLVersionInfo::getMinor(), LLVersionInfo::getPatch(), LLVersionInfo::getBuild());
 const std::string FSDATA_URL = "http://phoenixviewer.com/app/fsdatatest/data.xml";
 const std::string AGENTS_URL = "http://phoenixviewer.com/app/fsdatatest/agents.xml";
 const std::string LEGACY_CLIENT_LIST_URL = "http://phoenixviewer.com/app/client_tags/client_list_v2.xml";
diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp
index 033ae05f77..60a4be93f3 100644
--- a/indra/newview/fslslpreproc.cpp
+++ b/indra/newview/fslslpreproc.cpp
@@ -39,7 +39,6 @@
 #include "llviewertexteditor.h"
 #include "llinventorymodel.h"
 #include "llviewercontrol.h"
-#include "llversionviewer.h"
 #include <iostream>
 #include <fstream>
 #include <string>
diff --git a/indra/newview/res/viewerRes.rc.in b/indra/newview/res/viewerRes.rc
similarity index 100%
rename from indra/newview/res/viewerRes.rc.in
rename to indra/newview/res/viewerRes.rc
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index ea1cf2656a..7949803f7a 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -21,7 +21,6 @@
 #include "llinstantmessage.h"
 #include "llnotificationsutil.h"
 #include "lluictrlfactory.h"
-#include "llversionviewer.h"
 #include "llviewerparcelmgr.h"
 #include "llviewermenu.h"
 #include "llviewerregion.h"