Merge remote-tracking branch 'siana/master'

2012-02-10 02:14:44 +01:00
parent e0b21b08fa e10581e319
commit 0a59b3bb54
30 changed files with 255 additions and 183 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 /installed.xml
+/indra/llcommon/llversionviewer.h
 /indra/build-*
 /indra/tools/vstool/obj/
 *.aps
@@ -11,6 +12,7 @@
 /indra/viewer-*
 /indra/newview/vivox-runtime/
 /libraries/
+/lib/
 *.pyc
 *.orig
 *.rej
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -26,7 +26,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 include(Variables)

 # Load versions now.  Install locations need them.
-include(Versions)
+include(BuildVersion)

 include(UnixInstall)

--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -28,6 +28,9 @@ set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;ReleaseSSE2;Debug" CACHE S
 # Platform-specific compilation flags.

 if (WINDOWS)
+  # Remove default /Zm1000 flag that cmake inserts
+  string (REPLACE "/Zm1000" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+
  # Don't build DLLs.
  set(BUILD_SHARED_LIBS OFF)

@@ -113,7 +116,7 @@ if (WINDOWS)
    
 endif (WINDOWS)

-set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math -frounding-math")
+set (GCC_EXTRA_OPTIMIZATIONS "-ffast-math")

 if (LINUX)
  set(CMAKE_SKIP_RPATH TRUE)
@@ -182,6 +185,8 @@ if (LINUX)
      -pthread
      )

+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
+
  add_definitions(-DAPPID=secondlife)
  add_definitions(-fvisibility=hidden)
  # don't catch SIGCHLD in our base application class for the viewer - some of our 3rd party libs may need their *own* SIGCHLD handler to work.  Sigh!  The viewer doesn't need to catch SIGCHLD anyway.
@@ -200,10 +205,10 @@ if (LINUX)
    if (NOT STANDALONE)
  	set(MARCH_FLAG " -march=pentium4")
    endif (NOT STANDALONE)
-    set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
-    set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
+    set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO}${MARCH_FLAG} -mfpmath=sse,387 -msse2 ${GCC_EXTRA_OPTIMIZATIONS}")
  endif (${ARCH} STREQUAL "x86_64")

  set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG} -msse2")
--- a/indra/cmake/BuildVersion.cmake
+++ b/indra/cmake/BuildVersion.cmake
@@ -1,23 +1,41 @@
 # -*- cmake -*-

-function (build_version _target)
-  # Read version components from the header file.
-  file(STRINGS ${LIBS_OPEN_DIR}/llcommon/llversion${_target}.h lines
-       REGEX " LL_VERSION_")
-  foreach(line ${lines})
-    string(REGEX REPLACE ".*LL_VERSION_([A-Z]+).*" "\\1" comp "${line}")
-    string(REGEX REPLACE ".* = ([0-9]+);.*" "\\1" value "${line}")
-    set(v${comp} "${value}")
-  endforeach(line)
+# Read version components from the header file.
+file(STRINGS ${LIBS_OPEN_DIR}/llcommon/llversionviewer.h.in lines
+   REGEX " LL_VERSION_")
+foreach(line ${lines})
+  string(REGEX REPLACE ".*LL_VERSION_([A-Z]+).*" "\\1" comp "${line}")
+  string(REGEX REPLACE ".* = ([0-9]+);.*" "\\1" value "${line}")
+  set(v${comp} "${value}")
+endforeach(line)

-  # Compose the version.
-  set(${_target}_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
-  if (${_target}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
-    message(STATUS "Version of ${_target} is ${${_target}_VERSION}")
-  else (${_target}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
-    message(FATAL_ERROR "Could not determine ${_target} version (${${_target}_VERSION})")
-  endif (${_target}_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+execute_process(
+    COMMAND git rev-list HEAD
+    OUTPUT_VARIABLE GIT_REV_LIST_STR
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)

-  # Report version to caller.
-  set(${_target}_VERSION "${${_target}_VERSION}" PARENT_SCOPE)
-endfunction (build_version)
+string(REPLACE "\n" ";" GIT_REV_LIST ${GIT_REV_LIST_STR})
+
+if(GIT_REV_LIST)
+  list(LENGTH GIT_REV_LIST vBUILD)
+else()
+  set(vBUILD 99)
+endif()
+
+configure_file(
+    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h.in
+    ${CMAKE_SOURCE_DIR}/llcommon/llversionviewer.h
+)
+
+# Compose the version.
+set(viewer_VERSION "${vMAJOR}.${vMINOR}.${vPATCH}.${vBUILD}")
+if (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(STATUS "Version is ${viewer_VERSION}")
+else (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+  message(FATAL_ERROR "Could not determine version (${viewer_VERSION})")
+endif (viewer_VERSION MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+$")
+
+# Report version to caller.
+#set(viewer_VERSION "${viewer_VERSION}" PARENT_SCOPE)
--- a/indra/cmake/CMakeLists.txt
+++ b/indra/cmake/CMakeLists.txt
@@ -79,7 +79,6 @@ set(cmake_SOURCE_FILES
    UI.cmake
    UnixInstall.cmake
    Variables.cmake
-    Versions.cmake
    XmlRpcEpi.cmake
    ZLIB.cmake
    )
--- a/indra/cmake/Versions.cmake
+++ b/indra/cmake/Versions.cmake
@@ -1,9 +0,0 @@
-include(BuildVersion)
-
-if(VIEWER)
-  build_version(viewer)
-endif(VIEWER)
-
-if(SERVER)
-  build_version(server)
-endif(SERVER)
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -213,8 +213,7 @@ set(llcommon_HEADER_FILES
    lluri.h
    lluuid.h
    lluuidhashmap.h
-    llversionserver.h
-    llversionviewer.h
+    llversionviewer.h.in
    llworkerthread.h
    metaclass.h
    metaclasst.h
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -1,44 +0,0 @@
-/** 
- * @file llversionserver.h
- * @brief
- *
- * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
- * Copyright (c) 2002-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  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 LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-#ifndef LL_LLVERSIONSERVER_H
-#define LL_LLVERSIONSERVER_H
-
-const S32 LL_VERSION_MAJOR = 1;
-const S32 LL_VERSION_MINOR = 27;
-const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 132845;
-
-const char * const LL_CHANNEL = "Second Life Server";
-
-
-#endif
--- a/indra/llcommon/llversionviewer.h.in
+++ b/indra/llcommon/llversionviewer.h.in
@@ -36,12 +36,13 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 6;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 3;
+const S32 LL_VERSION_BUILD = ${vBUILD};

-const char * const LL_CHANNEL = "Singularity";
+const char * const LL_CHANNEL = "${VIEWER_CHANNEL}";

 #if LL_DARWIN
-const char * const LL_VERSION_BUNDLE_ID = "com.secondlife.singularity.viewer";
+const char * const LL_VERSION_BUNDLE_ID = "org.singularityviewer.singularity";
 #endif

 #endif
+
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -611,7 +611,6 @@ void LLButton::draw()
 	S32 text_left = mLeftHPad;
 	S32 text_right = getRect().getWidth() - mRightHPad;
 	S32 text_width = getRect().getWidth() - mLeftHPad - mRightHPad;
-	S32 text_middle = text_left + text_width/2;

 	// draw overlay image
 	if (mImageOverlay.notNull() && mImageOverlay->getWidth() > 1)
@@ -646,7 +645,6 @@ void LLButton::draw()
 		case LLFontGL::LEFT:
 			text_left += overlay_width + 1;
 			text_width -= overlay_width + 1;
-			text_middle += (overlay_width+1)/4;
 			mImageOverlay->draw(
 				mLeftHPad, 
 				center_y - (overlay_height / 2), 
@@ -665,7 +663,6 @@ void LLButton::draw()
 		case LLFontGL::RIGHT:
 			text_right -= overlay_width + 1;				
 			text_width -= overlay_width + 1;
-			text_middle += (overlay_width+1)/4;
 			mImageOverlay->draw(
 				getRect().getWidth() - mRightHPad - overlay_width, 
 				center_y - (overlay_height / 2), 
@@ -691,10 +688,7 @@ void LLButton::draw()
 			x = text_right;
 			break;
 		case LLFontGL::HCENTER:
-			{
-				S32 actual_width = mGLFont->getWidth(label.c_str());
-				x = llmax(text_middle, text_left + actual_width/2);
-			}
+			x = text_left + (text_width / 2);
 			break;
 		case LLFontGL::LEFT:
 		default:
@@ -710,7 +704,6 @@ void LLButton::draw()
 			x++;
 		}

-
 		mGLFont->render(label, 0, 
 			(F32)x, 
 			(F32)(LLBUTTON_V_PAD + y_offset), 
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -76,6 +76,7 @@ include_directories(
    )

 set(viewer_SOURCE_FILES
+    sgversion.cpp
    llviewerobjectbackup.cpp
    slfloatermediafilter.cpp
    floaterlocalassetbrowse.cpp
@@ -561,6 +562,7 @@ set(viewer_HEADER_FILES
    CMakeLists.txt
    ViewerInstall.cmake

+    sgversion.h
    llviewerobjectbackup.h
    slfloatermediafilter.h
    floaterlocalassetbrowse.h
@@ -943,7 +945,6 @@ set(viewer_HEADER_FILES
    llviewerassetstorage.h
    llviewerassettype.h
    llvieweraudio.h
-    llviewerbuild.h
    llviewercamera.h
    llviewercontrol.h
    llviewerdisplay.h
--- a/indra/newview/app_settings/keys.ini
+++ b/indra/newview/app_settings/keys.ini
@@ -52,6 +52,7 @@ FIRST_PERSON	F		SHIFT		toggle_fly

 FIRST_PERSON	SPACE		NONE		stop_moving
 FIRST_PERSON	ENTER		NONE		start_chat
+FIRST_PERSON	DIVIDE		NONE		start_gesture
 FIRST_PERSON	/		NONE		start_gesture

 FIRST_PERSON	LEFT		SHIFT		slide_left
@@ -89,6 +90,7 @@ THIRD_PERSON	F		SHIFT		toggle_fly

 THIRD_PERSON	SPACE		NONE		stop_moving
 THIRD_PERSON	ENTER		NONE		start_chat
+THIRD_PERSON	DIVIDE		NONE		start_gesture
 THIRD_PERSON	/		NONE		start_gesture

 THIRD_PERSON	LEFT		NONE		turn_left
@@ -201,6 +203,7 @@ EDIT		S		NONE		move_backward
 EDIT		E		NONE		spin_over
 EDIT		C		NONE		spin_under
 EDIT		ENTER		NONE		start_chat
+EDIT		DIVIDE		NONE		start_gesture
 EDIT		/		NONE		start_gesture
 EDIT		PAD_ENTER	NONE		start_chat
 EDIT		PAD_DIVIDE	NONE		start_gesture
@@ -330,6 +333,7 @@ SITTING		PAD_ENTER	CTL_ALT_SHIFT	start_chat
 SITTING		PAD_DIVIDE	CTL_ALT_SHIFT	start_gesture

 SITTING		ENTER		NONE		start_chat
+SITTING		DIVIDE		NONE		start_gesture
 SITTING		/		NONE		start_gesture

 # Avatar editing camera controls
@@ -346,6 +350,7 @@ EDIT_AVATAR	DOWN		NONE		edit_avatar_move_backward
 EDIT_AVATAR	PGUP		NONE		edit_avatar_spin_over
 EDIT_AVATAR	PGDN		NONE		edit_avatar_spin_under
 EDIT_AVATAR	ENTER		NONE		start_chat
+EDIT_AVATAR	DIVIDE		NONE		start_gesture
 EDIT_AVATAR	/		NONE		start_gesture
 EDIT_AVATAR	PAD_LEFT	NONE		edit_avatar_spin_cw
 EDIT_AVATAR	PAD_RIGHT	NONE		edit_avatar_spin_ccw
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -37,7 +37,7 @@
 #include "hippogridmanager.h"
 #include "hippolimits.h"

-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "llfeaturemanager.h"
 #include "lluictrlfactory.h"
 #include "lltexteditor.h"
@@ -643,11 +643,11 @@ bool LLAppViewer::init()

 	// Build a string representing the current version number.
    gCurrentVersion = llformat("%s %d.%d.%d.%d",
-        LL_CHANNEL,
-        LL_VERSION_MAJOR,
-        LL_VERSION_MINOR,
-        LL_VERSION_PATCH,
-        LL_VERSION_BUILD );
+        gVersionChannel,
+        gVersionMajor,
+        gVersionMinor,
+        gVersionPatch,
+        gVersionBuild );

 	//////////////////////////////////////////////////////////////////////////////
 	//////////////////////////////////////////////////////////////////////////////
@@ -2045,7 +2045,7 @@ bool LLAppViewer::initConfiguration()
 	gSavedSettings.setString("ClientSettingsFile", 
        gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, getSettingsFilename("Default", "Global")));

-	gSavedSettings.setString("VersionChannelName", LL_CHANNEL);
+	gSavedSettings.setString("VersionChannelName", gVersionChannel);

 #ifndef	LL_RELEASE_FOR_DOWNLOAD
 	// provide developer build only overrides for these control variables that are not
@@ -2654,12 +2654,12 @@ void LLAppViewer::writeSystemInfo()
 {
 	gDebugInfo["SLLog"] = LLError::logFileName();

-	gDebugInfo["ClientInfo"]["Name"] = LL_CHANNEL;
+	gDebugInfo["ClientInfo"]["Name"] = gVersionChannel;

-	gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
-	gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
-	gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
-	gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
+	gDebugInfo["ClientInfo"]["MajorVersion"] = gVersionMajor;
+	gDebugInfo["ClientInfo"]["MinorVersion"] = gVersionMinor;
+	gDebugInfo["ClientInfo"]["PatchVersion"] = gVersionPatch;
+	gDebugInfo["ClientInfo"]["BuildVersion"] = gVersionBuild;

 	gDebugInfo["CAFilename"] = gDirUtilp->getCAFile();

@@ -2694,7 +2694,7 @@ void LLAppViewer::writeSystemInfo()
 	
 	// Dump some debugging info
 	LL_INFOS("SystemInfo") << LLTrans::getString("APP_NAME")
-			<< " version " << LL_VERSION_MAJOR << "." << LL_VERSION_MINOR << "." << LL_VERSION_PATCH
+			<< " version " << gVersionMajor << "." << gVersionMinor << "." << gVersionPatch
 			<< LL_ENDL;

 	// Dump the local time and time zone
@@ -2758,12 +2758,12 @@ void LLAppViewer::handleViewerCrash()
 	//We already do this in writeSystemInfo(), but we do it again here to make /sure/ we have a version
 	//to check against no matter what

-	gDebugInfo["ClientInfo"]["Name"] = LL_CHANNEL;
+	gDebugInfo["ClientInfo"]["Name"] = gVersionChannel;

-	gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
-	gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
-	gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
-	gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
+	gDebugInfo["ClientInfo"]["MajorVersion"] = gVersionMajor;
+	gDebugInfo["ClientInfo"]["MinorVersion"] = gVersionMinor;
+	gDebugInfo["ClientInfo"]["PatchVersion"] = gVersionPatch;
+	gDebugInfo["ClientInfo"]["BuildVersion"] = gVersionBuild;

 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 	if ( parcel && parcel->getMusicURL()[0])
@@ -4607,12 +4607,12 @@ void LLAppViewer::handleLoginComplete()
 	initMainloopTimeout("Mainloop Init");

 	// Store some data to DebugInfo in case of a freeze.
-	gDebugInfo["ClientInfo"]["Name"] = LL_CHANNEL;
+	gDebugInfo["ClientInfo"]["Name"] = gVersionChannel;

-	gDebugInfo["ClientInfo"]["MajorVersion"] = LL_VERSION_MAJOR;
-	gDebugInfo["ClientInfo"]["MinorVersion"] = LL_VERSION_MINOR;
-	gDebugInfo["ClientInfo"]["PatchVersion"] = LL_VERSION_PATCH;
-	gDebugInfo["ClientInfo"]["BuildVersion"] = LL_VERSION_BUILD;
+	gDebugInfo["ClientInfo"]["MajorVersion"] = gVersionMajor;
+	gDebugInfo["ClientInfo"]["MinorVersion"] = gVersionMinor;
+	gDebugInfo["ClientInfo"]["PatchVersion"] = gVersionPatch;
+	gDebugInfo["ClientInfo"]["BuildVersion"] = gVersionBuild;

 	LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 	if ( parcel && parcel->getMusicURL()[0])
--- a/indra/newview/llfloaterabout.cpp
+++ b/indra/newview/llfloaterabout.cpp
@@ -49,7 +49,7 @@
 #include "llagent.h"
 #include "llviewerstats.h"
 #include "llviewerregion.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "llviewerbuild.h"
 #include "lluictrlfactory.h"
 #include "lluri.h"
@@ -137,9 +137,9 @@ LLFloaterAbout::LLFloaterAbout()
 	// Version string
 	std::string version = std::string(LLAppViewer::instance()->getSecondLifeTitle()
 		+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
-		LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
+		gVersionMajor, gVersionMinor, gVersionPatch, LL_VIEWER_BUILD,
 		__DATE__, __TIME__,
-		LL_CHANNEL));
+		gVersionChannel));
 	support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
 	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);

@@ -331,13 +331,13 @@ static std::string get_viewer_release_notes_url()
 {
 	return "http://www.singularityviewer.org";
 	/*std::ostringstream version;
-	version <<  LL_VERSION_MAJOR
-		<< "." << LL_VERSION_MINOR
-		<< "." << LL_VERSION_PATCH
-		<< "." << LL_VERSION_BUILD;
+	version <<  gVersionMajor
+		<< "." << gVersionMinor
+		<< "." << gVersionPatch
+		<< "." << gVersionBuild;
 	LLSD query;

-	query["channel"] = LL_CHANNEL;
+	query["channel"] = gVersionChannel;

 	query["version"] = version.str();

--- a/indra/newview/llfloaterreporter.cpp
+++ b/indra/newview/llfloaterreporter.cpp
@@ -47,7 +47,7 @@
 #include "llimagej2c.h"
 #include "llstring.h"
 #include "llsys.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "message.h"
 #include "v3math.h"

@@ -747,10 +747,10 @@ LLSD LLFloaterReporter::gatherReport()

 	if ( mReportType == BUG_REPORT)
 	{
-		summary << short_platform << " V" << LL_VERSION_MAJOR << "."
-			<< LL_VERSION_MINOR << "."
-			<< LL_VERSION_PATCH << "."
-			<< LL_VERSION_BUILD
+		summary << short_platform << " V" << gVersionMajor << "."
+			<< gVersionMinor << "."
+			<< gVersionPatch << "."
+			<< gVersionBuild
 			<< " (" << regionp->getName() << ")"
 			<< "[" << category_name << "] "
 			<< "\"" << childGetValue("summary_edit").asString() << "\"";
@@ -768,10 +768,10 @@ LLSD LLFloaterReporter::gatherReport()
 	std::ostringstream details;
 	if (mReportType != BUG_REPORT)
 	{
-		details << "V" << LL_VERSION_MAJOR << "."	// client version moved to body of email for abuse reports
-			<< LL_VERSION_MINOR << "."
-			<< LL_VERSION_PATCH << "."
-			<< LL_VERSION_BUILD << std::endl << std::endl;
+		details << "V" << gVersionMajor << "."	// client version moved to body of email for abuse reports
+			<< gVersionMinor << "."
+			<< gVersionPatch << "."
+			<< gVersionBuild << std::endl << std::endl;
 	}
 	std::string object_name = childGetText("object_name");
 	std::string owner_name = childGetText("owner_name");
@@ -792,9 +792,9 @@ LLSD LLFloaterReporter::gatherReport()
 	std::string version_string;
 	version_string = llformat(
 			"%d.%d.%d %s %s %s %s",
-			LL_VERSION_MAJOR,
-			LL_VERSION_MINOR,
-			LL_VERSION_PATCH,
+			gVersionMajor,
+			gVersionMinor,
+			gVersionPatch,
 			platform,
 			gSysCPU.getFamily().c_str(),
 			gGLManager.mGLRenderer.c_str(),
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -5251,7 +5251,7 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 		items.push_back(std::string("Wearable Wear"));
 		items.push_back(std::string("Wearable Edit"));
 // [RLVa:KB] - Checked: 2011-09-16 (RLVa-1.1.4a) | Added: RLVa-1.1.4a
-		if ( (rlv_handler_t::isEnabled()) && (!gRlvWearableLocks.canRemove(item)) )
+		if ( (rlv_handler_t::isEnabled()) && (gRlvWearableLocks.canRemove(item)) )
 		{
 			disabled_items.push_back(std::string("Wearable Wear"));
 			disabled_items.push_back(std::string("Wearable Edit"));
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -42,7 +42,7 @@
 #include "llfontgl.h"
 #include "llmd5.h"
 #include "llsecondlifeurls.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "v4color.h"

 #include "llbutton.h"
@@ -347,12 +347,12 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 	childSetAction("grids_btn", onClickGrids, this);
 	childSetCommitCallback("grids_combo", onSelectGrid, this);

-	std::string channel = LL_CHANNEL;
+	std::string channel = gVersionChannel;

 	std::string version = llformat("%d.%d.%d (%d)",
-		LL_VERSION_MAJOR,
-		LL_VERSION_MINOR,
-		LL_VERSION_PATCH,
+		gVersionMajor,
+		gVersionMinor,
+		gVersionPatch,
 		LL_VIEWER_BUILD );
 	LLTextBox* channel_text = getChild<LLTextBox>("channel_text");
 	channel_text->setTextArg("[CHANNEL]", channel); // though not displayed
@@ -934,10 +934,10 @@ void LLPanelLogin::loadLoginPage()
 	}

 	std::string version = llformat("%d.%d.%d (%d)",
-						LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD);
+						gVersionMajor, gVersionMinor, gVersionPatch, gVersionBuild);

 	if(login_page.find("secondlife.com") == -1) {
-		oStr << "&channel=" << LLWeb::curlEscape(LL_CHANNEL);
+		oStr << "&channel=" << LLWeb::curlEscape(gVersionChannel);
 		oStr << "&version=" << LLWeb::curlEscape(version);
 	}

--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -85,7 +85,7 @@
 #include "llsecondlifeurls.h"
 #include "llstring.h"
 #include "lluserrelations.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "llvfs.h"
 #include "llxorcipher.h"	// saved password, MAC address
 #include "message.h"
@@ -533,9 +533,9 @@ bool idle_startup()
 			if(!start_messaging_system(
 				   message_template_path,
 				   port,
-				   LL_VERSION_MAJOR,
-				   LL_VERSION_MINOR,
-				   LL_VERSION_PATCH,
+				   gVersionMajor,
+				   gVersionMinor,
+				   gVersionPatch,
 				   FALSE,
 				   std::string(),
 				   responder,
@@ -3417,7 +3417,7 @@ bool update_dialog_callback(const LLSD& notification, const LLSD& response)
 	// userserver no longer exists.
 	query_map["userserver"] = LLViewerLogin::getInstance()->getGridLabel();
 	// <edit>
-	query_map["channel"] = LL_CHANNEL;
+	query_map["channel"] = gVersionChannel;

 	// *TODO constantize this guy
 	// *NOTE: This URL is also used in win_setup/lldownloader.cpp
--- a/indra/newview/lltranslate.cpp
+++ b/indra/newview/lltranslate.cpp
@@ -35,7 +35,7 @@
 #include "llbufferstream.h"
 #include "lltranslate.h"
 #include "llui.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "llweb.h"

 // <edit>
--- a/indra/newview/lluserauth.cpp
+++ b/indra/newview/lluserauth.cpp
@@ -38,7 +38,7 @@
 #include <iterator>

 #include "lldir.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "llappviewer.h"
 #include "llviewerbuild.h"
 #include "llviewercontrol.h"
@@ -131,7 +131,7 @@ void LLUserAuth::authenticate(
 	XMLRPC_VectorAppendString(params, "web_login_key", web_login_key.getString().c_str(), 0);
 	XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
 	XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
-	XMLRPC_VectorAppendString(params, "channel", LL_CHANNEL, 0);
+	XMLRPC_VectorAppendString(params, "channel", gVersionChannel, 0);
 	XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);

 	XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
@@ -219,7 +219,7 @@ void LLUserAuth::authenticate(
 	XMLRPC_VectorAppendString(params, "passwd", dpasswd.c_str(), 0);
 	XMLRPC_VectorAppendString(params, "start", start.c_str(), 0);
 	XMLRPC_VectorAppendString(params, "version", gCurrentVersion.c_str(), 0); // Includes channel name
-	XMLRPC_VectorAppendString(params, "channel", LL_CHANNEL, 0);
+	XMLRPC_VectorAppendString(params, "channel", gVersionChannel, 0);
 	XMLRPC_VectorAppendString(params, "platform", PLATFORM_STRING, 0);

 	XMLRPC_VectorAppendString(params, "mac", hashed_mac.c_str(), 0);
--- a/indra/newview/llviewerbuild.h
+++ b/indra/newview/llviewerbuild.h
@@ -30,8 +30,8 @@
 * $/LicenseInfo$
 */

-#include "llversionviewer.h"
+#include "sgversion.h"

 // Set the build number in indra/llcommon/llversionviewer.h!

-const S32 LL_VIEWER_BUILD = LL_VERSION_BUILD;
+const S32 LL_VIEWER_BUILD = gVersionBuild;
--- a/indra/newview/llviewercontrol.cpp
+++ b/indra/newview/llviewercontrol.cpp
@@ -70,7 +70,7 @@
 #include "llnotify.h"
 #include "llkeyboard.h"
 #include "llerrorcontrol.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "llappviewer.h"
 #include "llvosurfacepatch.h"
 #include "llvowlsky.h"
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -163,7 +163,7 @@
 #include "hippolimits.h"
 #include "hipporestrequest.h"
 #include "hippofloaterxml.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "m7wlinterface.h"

 #include "llwlparammanager.h"
@@ -3218,7 +3218,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				// hello from object
 				if (from_id.isNull()) return;
 				char buf[200];
-				snprintf(buf, 200, "%s v%d.%d.%d", LL_CHANNEL, LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH);
+				snprintf(buf, 200, "%s v%d.%d.%d", gVersionChannel, gVersionMajor, gVersionMinor, gVersionPatch);
 				send_chat_from_viewer(buf, CHAT_TYPE_WHISPER, 427169570);
 				gChatObjectAuth[from_id] = 1;
 			} else if (gChatObjectAuth.find(from_id) != gChatObjectAuth.end()) {
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -20,7 +20,7 @@
 #include "llavatarnamecache.h"
 #include "llnotificationsutil.h"
 #include "lluictrlfactory.h"
-#include "llversionviewer.h"
+#include "sgversion.h"
 #include "llviewermenu.h"
 #include "llviewerparcelmgr.h"
 #include "llviewerregion.h"
@@ -305,7 +305,7 @@ std::string RlvStrings::getVersion(bool fLegacy /*=false*/)
 	return llformat("%s viewer v%d.%d.%d (%s %d.%d.%d.%d - RLVa %d.%d.%d)",
 		( (!fLegacy) ? "RestrainedLove" : "RestrainedLife" ),
 		RLV_VERSION_MAJOR, RLV_VERSION_MINOR, RLV_VERSION_PATCH,
-		LLAppViewer::instance()->getSecondLifeTitle().c_str(), LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BUILD,
+		LLAppViewer::instance()->getSecondLifeTitle().c_str(), gVersionMajor, gVersionMinor, gVersionPatch, gVersionBuild,
 		RLVa_VERSION_MAJOR, RLVa_VERSION_MINOR, RLVa_VERSION_PATCH);
 }

--- a/indra/newview/sgversion.cpp
+++ b/indra/newview/sgversion.cpp
@@ -0,0 +1,30 @@
+/* Copyright (C) 2012 Siana Gearz
+ *
+ * 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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 */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llversionviewer.h"
+
+#include "sgversion.h"
+
+const S32 gVersionMajor = LL_VERSION_MAJOR;
+const S32 gVersionMinor = LL_VERSION_MINOR;
+const S32 gVersionPatch = LL_VERSION_PATCH;
+const S32 gVersionBuild = LL_VERSION_BUILD;
+
+const char* gVersionChannel = LL_CHANNEL;
+
--- a/indra/newview/sgversion.h
+++ b/indra/newview/sgversion.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2012 Siana Gearz
+ *
+ * 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; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * 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 */
+
+#ifndef SGVERSION_H
+#define SGVERSION_H
+
+extern const S32 gVersionMajor;
+extern const S32 gVersionMinor;
+extern const S32 gVersionPatch;
+extern const S32 gVersionBuild;
+
+extern const char* gVersionChannel;
+
+
+#endif
--- a/indra/newview/skins/default/xui/en-us/panel_audio.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_audio.xml
@@ -1,17 +1,60 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="false" height="100" label="Audio &amp; Video" name="Media panel" width="250">
-	<slider control_name="AudioLevelMaster" follows="top" height="15" increment="0.005" initial_val="0.5" label="Master" label_width="40" left="3" max_val="1" min_val="0" name="System Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteAudio" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_audio" toggle="true" width="25"/>
-	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="top" height="15" increment="0.005" initial_val="0.5" label="Music" label_width="40" left="3" max_val="1" min_val="0" name="Music Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteMusic" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_music" toggle="true" width="25"/>
-	<slider control_name="AudioLevelMedia" follows="top" height="15" increment="0.005" initial_val="0.5" label="Media" label_width="40" left="3" max_val="1" min_val="0" name="Media Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteMedia" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_media" toggle="true" width="25"/>
-	<slider control_name="AudioLevelVoice" follows="top" height="15" increment="0.005" initial_val="0.5" label="Voice" label_width="40" left="3" max_val="1" min_val="0" name="Voice Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteVoice" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_voice" toggle="true" width="25"/>
-	<slider control_name="AudioLevelSFX" follows="top" height="15" increment="0.005" initial_val="0.5" label="Sounds" label_width="40" left="3" max_val="1" min_val="0" name="SFX Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteSounds" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" right="-28" name="mute_sfx" toggle="true" width="25"/>
-	<slider control_name="AudioLevelAmbient" follows="top" height="15" increment="0.005" initial_val="0.5" label="Ambient" label_width="40" left="3" max_val="1" min_val="0" name="Wind Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteAmbient" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_wind" toggle="true" width="25"/>
-	<slider control_name="AudioLevelUI" follows="top" height="15" increment="0.005" initial_val="0.5" label="UI" label_width="40" left="3" max_val="1" min_val="0" name="UI Volume" show_text="false" volume="true" width="188"/>
-	<button bottom_delta="0" control_name="MuteUI" follows="top" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" right="-28" label="" name="mute_ui" toggle="true" width="25"/>
+<panel border="false" follows="left|top|right|bottom" height="160"
+     label="Audio &amp; Video" name="Media panel" width="175">
+	<slider bottom_delta="-20" control_name="AudioLevelMaster" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Master"
+	     label_width="55" left="10" max_val="1" min_val="0" mouse_opaque="true"
+	     name="System Volume" show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteAudio" follows="top|right" height="16"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+	     left="150" name="mute_audio" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-30" control_name="AudioLevelMusic" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Music"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Music Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteMusic" follows="top|right" height="16"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+	     left="150" name="mute_music" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelMedia" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Media"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Media Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteMedia" follows="top|right" height="16"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+	     left="150" name="mute_media" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelVoice" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Voice"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Voice Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteVoice" follows="top|right" height="16"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+	     left="150" name="mute_voice" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelSFX" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Sounds"
+	     label_width="55" left="10" max_val="1" min_val="0" name="SFX Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteSounds" follows="top|right" height="16"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+	     left="150" name="mute_sfx" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelAmbient" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="Ambient"
+	     label_width="55" left="10" max_val="1" min_val="0" name="Wind Volume"
+	     show_text="false" volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteAmbient" follows="top|right" height="16"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+	     left="150" name="mute_wind" tab_stop="false" toggle="true" width="25" />
+	<slider bottom_delta="-20" control_name="AudioLevelUI" follows="left|top|right"
+	     height="15" increment="0.05" initial_val="0.5" label="UI" label_width="55"
+	     left="10" max_val="1" min_val="0" name="UI Volume" show_text="false"
+	     volume="true" width="180" />
+	<button bottom_delta="0" control_name="MuteUI" follows="top|right" height="16"
+	     image_selected="icn_speaker-muted_dark.tga"
+	     image_unselected="icn_speaker_dark.tga" label="" label_width="55"
+	     left="150" name="mute_ui" tab_stop="false" toggle="true" width="25" />
 </panel>
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml
@@ -39,7 +39,7 @@
 	<text bottom="-331" height="18" left="10" name="crash_report_textbox">Crash reports:</text>
 	<text bottom="-363" height="18" name="language_textbox">Language:</text>
 	<text bottom_delta="6" follows="top" height="18" left_delta="243" name="language_textbox2">(Requires restart for full effect)
-					*Uses English UI</text>
+          *Uses English UI</text>
 	<combo_box allow_text_entry="true" bottom="-361" follows="top" height="16" left="103" name="language_combobox" max_chars="32" width="140">
 		<combo_item name="System Default Language" value="default">System Default</combo_item>
 		<combo_item name="English" value="en-us">English</combo_item>		
--- a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -18,7 +18,7 @@
 				<button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
 				<text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
 				<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
-				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
+				<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
 				<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
 			</panel>
 		</layout_panel>
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -172,7 +172,7 @@ class ViewerManifest(LLManifest):

 class WindowsManifest(ViewerManifest):
    def final_exe(self):
-        return 'SingularityViewer.exe'
+        return self.channel_oneword() + 'Viewer.exe'


    def construct(self):
@@ -399,17 +399,17 @@ class WindowsManifest(ViewerManifest):
        !define VERSION_LONG "%(version)s"
        !define VERSION_DASHES "%(version_dashes)s"
        """ % substitution_strings
-        installer_file = "Singularity_%(version_short)s_Setup.exe"
+        installer_file = "%(channel_oneword)s_%(version_dashes)s_Setup.exe"
        grid_vars_template = """
        OutFile "%(installer_file)s"
-        !define VIEWERNAME "Singularity Viewer"
+        !define VIEWERNAME "%(channel)s"
        !define INSTFLAGS "%(flags)s"
-        !define INSTNAME   "SingularityViewer"
-        !define SHORTCUT   "Singularity Viewer"
+        !define INSTNAME   "%(channel_oneword)s"
+        !define SHORTCUT   "%(channel)s"
        !define URLNAME   "secondlife"
        !define INSTALL_ICON "install_icon_singularity.ico"
        !define UNINSTALL_ICON "install_icon_singularity.ico"
-        Caption "Singularity Viewer ${VERSION}"
+        Caption "${VIEWERNAME} ${VERSION_LONG}"
        """
        if 'installer_name' in self.args:
            installer_file = self.args['installer_name']