diff --git a/indra/develop.py b/indra/develop.py
index 4295234e0..48fc7427e 100755
--- a/indra/develop.py
+++ b/indra/develop.py
@@ -73,10 +73,10 @@ class PlatformSetup(object):
     for t in ('Debug', 'Release', 'RelWithDebInfo'):
         build_types[t.lower()] = t
 
-    build_type = build_types['relwithdebinfo']
+    build_type = build_types['release']
     standalone = 'OFF'
     unattended = 'OFF'
-    project_name = 'SecondLife'
+    project_name = 'Ascent'
     distcc = True
     cmake_opts = []
     word_size = 32
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index b2d453949..9fac68fde 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -484,6 +484,7 @@ BOOL LLImageJ2C::validate(U8 *data, U32 file_size)
 		{
 			if (mImpl)
 				res = mImpl->getMetadata(*this);
+			else res = FALSE;
 		}
 	}
 	
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index fe8ed3083..97a4e358e 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -114,6 +114,7 @@ BOOL LLImageJ2COJ::decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decod
 	// FIXME: Get the comment field out of the texture
 	//
 	if (!base.getData()) return FALSE;
+	if (!base.getDataSize()) return FALSE;
 
 	LLTimer decode_timer;
 
@@ -419,6 +420,7 @@ BOOL LLImageJ2COJ::getMetadata(LLImageJ2C &base)
 	// FIXME: We get metadata by decoding the ENTIRE image.
 	//
 	if (!base.getData()) return FALSE;
+	if (!base.getDataSize()) return FALSE;
 
 	// Update the raw discard level
 	base.updateRawDiscardLevel();
diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh
index 0108f0058..0250e8272 100755
--- a/indra/newview/linux_tools/wrapper.sh
+++ b/indra/newview/linux_tools/wrapper.sh
@@ -115,7 +115,7 @@ if [ -n "$LL_TCMALLOC" ]; then
     fi
 fi
 
-export VIEWER_BINARY='snowglobe-do-not-run-directly'
+export VIEWER_BINARY='Ascent-do-not-run-directly'
 export SL_ENV='LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}"'
 export SL_CMD='$LL_WRAPPER bin/$VIEWER_BINARY'
 export SL_OPT="`cat gridargs.dat` $@"
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index de859ad94..1f121c9ea 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -222,7 +222,7 @@ const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user fl
 F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
 F32 gSimFrames;
 
-BOOL gAllowIdleAFK = TRUE;
+BOOL gAllowIdleAFK = FALSE;
 BOOL gAllowTapTapHoldRun = TRUE;
 BOOL gShowObjectUpdates = FALSE;
 BOOL gUseQuickTime = TRUE;
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 52d980300..6420a96d2 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -125,7 +125,7 @@ class ViewerManifest(LLManifest):
     def installer_prefix(self):
         mapping={"secondlife":'SecondLife_',
                  "snowglobe":'Snowglobe_',
-                 "Inertia":'Inertia_'}
+                 "Ascent":'Ascent_'}
         return mapping[self.viewer_branding_id()]
 
     def flags_list(self):
@@ -547,13 +547,13 @@ class DarwinManifest(ViewerManifest):
     def app_name(self):
         mapping={"secondlife":"Second Life",
                  "snowglobe":"Snowglobe",
-                 "Inertia":"Intertia"}
+                 "Ascent":"Ascent"}
         return mapping[self.viewer_branding_id()]
         
     def info_plist_name(self):
         mapping={"secondlife":"Info-SecondLife.plist",
                  "snowglobe":"Info-Snowglobe.plist",
-                 "Inertia":"Info-Inertia.plist"}
+                 "Ascent":"Info-Ascent.plist"}
         return mapping[self.viewer_branding_id()]
 
     def package_finish(self):
@@ -692,19 +692,19 @@ class LinuxManifest(ViewerManifest):
     def wrapper_name(self):
         mapping={"secondlife":"secondlife",
                  "snowglobe":"snowglobe",
-                 "Inertia":"inertia"}
+                 "Ascent":"Ascent"}
         return mapping[self.viewer_branding_id()]
 
     def binary_name(self):
-        mapping={"secondlife":"do-not-directly-run-secondlife-bin",
-                 "snowglobe":"snowglobe-do-not-run-directly",
-                 "Inertia":"inertia-do-not-run-directly"}
+        mapping={"secondlife":"Ascent-do-not-run-directly",
+                 "snowglobe":"Ascent-do-not-run-directly",
+                 "Ascent":"Ascent-do-not-run-directly"}
         return mapping[self.viewer_branding_id()]
     
     def icon_name(self):
         mapping={"secondlife":"secondlife_icon.png",
                  "snowglobe":"snowglobe_icon.png",
-                 "Inertia":"inertia_icon.png"}
+                 "Ascent":"Ascent_icon.png"}
         return mapping[self.viewer_branding_id()]
 
     def package_finish(self):
@@ -720,7 +720,7 @@ class LinuxManifest(ViewerManifest):
             else:
                 installer_name += '_' + self.channel_oneword().upper()
 
-	installer_name = 'Inertia'
+	installer_name = 'Ascent'
 
         # Fix access permissions
         self.run_command("""