Merge branch 'master' of https://github.com/siana/SingularityViewer

indra/llcommon/llversionviewer.h

@@ -36,7 +36,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 6;
 const S32 LL_VERSION_PATCH = 0;
-const S32 LL_VERSION_BUILD = 1;
+const S32 LL_VERSION_BUILD = 2;
 
 const char * const LL_CHANNEL = "Singularity";
 

indra/newview/lldrawpoolbump.cpp

@@ -794,7 +794,7 @@ void LLDrawPoolBump::endBump(U32 pass)
 	{
 		// Disable texture blending on unit 1
 		gGL.getTexUnit(1)->activate();
-		//gGL.getTexUnit(1)->disable();
+                gGL.getTexUnit(1)->disable();
 		gGL.getTexUnit(1)->setTextureBlendType(LLTexUnit::TB_MULT);
 
 		// Disable texture blending on unit 0

repackage.sh

@@ -15,6 +15,10 @@ LIBPATH=""
 INCPATH=""
 PWD=`pwd`
 
+if [ -z "$1" ]; then
+	usage
+fi
+
 shopt -s nocasematch
 case "$1" in
 	--windows|-w|windows|win)
@@ -40,6 +44,7 @@ case "$1" in
 		INCPATH="libraries/x86_64-linux/include"
 		;;
 	*)
+		echo ERROR: No mode specified
 		usage
 		;;
 esac
@@ -51,14 +56,14 @@ case "$2" in
 		;;
 esac
 
-test -n "$2" && FILEIN=`readlink -e $2`
-test -n "$3" && FILEOUT=`readlink -f $3`
-
-if [ -z $FILEIN ]; then
+FILEIN=$2
+if [ -z "$FILEIN" ]; then
+	echo ERROR: No input file specified
 	usage
 fi
 
-if [ -z $FILEOUT ]; then
+test -n "$3" && FILEOUT=`readlink -f $3`
+if [ -z "$FILEOUT" ]; then
 	FILEOUT=`readlink -m package.tar.bz2`
 fi
 
@@ -66,7 +71,7 @@ mkdir "$TMP"
 cd "$TMP"
 
 case "$FILEIN" in
-	http\:\/\/|https\:\/\/)
+	http\:\/\/*|https\:\/\/*)
 		echo "	Downloading..."
 		wget "$FILEIN" -O package.tar.bz2
 		echo "	Unpacking..."
@@ -74,6 +79,11 @@ case "$FILEIN" in
 		rm package.tar.bz2
 		;;
 	*)
+		FILEIN=`readlink -e $FILEIN`
+		if [ -z "$FILEIN"  ]; then
+			echo ERROR: Input file not found
+			usage
+		fi
 		echo "	Unpacking..."
 		tar -xjvf "$FILEIN"
 		;;