Merge branch 'next' of git://github.com/jacek/imprudence into next

Conflicts (manually merged):
	linden/indra/llcommon/llversionviewer.h
	linden/indra/llvfs/lldir.cpp
	linden/indra/llvfs/lldir_mac.cpp
	linden/indra/newview/CMakeLists.txt
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/Info-Imprudence.plist
	linden/indra/newview/Info-meta-impy.plist
	linden/indra/newview/llappviewer.cpp
	linden/indra/newview/llpanellogin.cpp
	linden/indra/newview/packaging/mac/Info.plist.in
	linden/indra/newview/res/viewerRes.rc
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_advanced.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_skins.xml
	linden/indra/newview/skins/default/xui/en-us/panel_preferences_web.xml
	linden/indra/newview/skins/default/xui/zh/menu_viewer.xml
	linden/indra/newview/skins/default/xui/zh/panel_group_general.xml
	linden/indra/newview/viewer_manifest.py
	linden/indra/newview/viewerversion.cpp
	linden/indra/newview/viewerversion.h
	linden/install.xml

Also some post merge tweaks.

1 files changed, 0 insertions, 89 deletions

diff --git a/linden/indra/newview/viewerversion.cpp b/linden/indra/newview/viewerversion.cpp
deleted file mode 100644
index 3678cb4..0000000
--- a/linden/indra/newview/viewerversion.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
-* @file viewerversion.cpp
-* @brief set the viewer version in xml
-*
-* $LicenseInfo:firstyear=2009&license=viewergpl$
-*
-* Copyright (c) 2010, McCabe Maxsted
-*
-* Imprudence Viewer Source Code
-* The source code in this file ("Source Code") is provided to you
-* under the terms of the GNU General Public License, version 2.0
-* ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
-* this distribution, or online at
-* http://secondlifegrid.net/programs/open_source/licensing/gplv2
-*
-* There are special exceptions to the terms and conditions of the GPL as
-* it is applied to this Source Code. View the full text of the exception
-* in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
-*
-* By copying, modifying or distributing this software, you acknowledge
-* that you have read and understood your obligations described above,
-* and agree to abide by those obligations.
-*
-* ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
-
-#include "llviewerprecompiledheaders.h"
-
-#include "lldir.h"
-#include "llxmltree.h"
-#include "viewerversion.h"
-
-
-S32 ViewerVersion::sVersionMajor = 0;
-S32 ViewerVersion::sVersionMinor = 0;
-S32 ViewerVersion::sVersionPatch = 0;
-std::string ViewerVersion::sVersionTest = "";
-
-const std::string ViewerVersion::sViewerName = "meta-impy";
-
-ViewerVersion::ViewerVersion()
-{
-}
-
-bool ViewerVersion::initViewerVersion()
-{
-        std::string file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "viewerversion.xml");
-
-        if (!gDirUtilp->fileExists(file_path))
-        {
-                llwarns << "Unable to find viewerversion.xml in app_settings folder" << llendl;
-                return false;
-        }
-        else
-        {
-                LLXMLNodePtr root;
-
-                if (!LLXMLNode::parseFile(file_path, root, NULL))
-                {
-                        llwarns << "Unable to parse version file: " << file_path << llendl;
-                        return false;
-                }
-                
-                if (root.isNull()) // shouldn't ever happen
-                {
-                        llwarns << "Error while trying to read viewerversion.xml" << llendl;
-                        return false;
-                }
-
-                LLXMLNodePtr child_nodep = root->getFirstChild();
-                while (child_nodep.notNull())
-                {
-                        child_nodep->getAttributeS32("version_major", sVersionMajor);
-                        child_nodep->getAttributeS32("version_minor", sVersionMinor);
-                        child_nodep->getAttributeS32("version_patch", sVersionPatch);
-                        child_nodep->getAttributeString("version_test", sVersionTest);
-
-                        child_nodep = child_nodep->getNextSibling();
-                }
-
-                llinfos << "Version set to: " << sVersionMajor << "." << sVersionMinor << "." << sVersionPatch << " " << sVersionTest << llendl;
-
-                return true;
-        }
-}