diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 4a9a0918f..c69f84889 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -12955,7 +12955,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>VectorizePerfTest</key>
     <map>
diff --git a/indra/newview/llface.cpp b/indra/newview/llface.cpp
index 14df6a742..f929f2fe6 100644
--- a/indra/newview/llface.cpp
+++ b/indra/newview/llface.cpp
@@ -997,6 +997,7 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 	BOOL rebuild_binormal = rebuild_pos && mVertexBuffer->hasDataType(LLVertexBuffer::TYPE_BINORMAL);
 
 	const LLTextureEntry *tep = mVObjp->getTE(f);
+	if (!tep) rebuild_color = FALSE;	// can't get color when tep is NULL
 	U8  bump_code = tep ? tep->getBumpmap() : 0;
 
 	if (rebuild_pos)
@@ -1094,9 +1095,9 @@ BOOL LLFace::getGeometryVolume(const LLVolume& volume,
 		}
 	}
 
-	LLColor4U color = tep->getColor();
+	LLColor4U color = (tep ? LLColor4U(tep->getColor()) : LLColor4U::white);
 
-	if (rebuild_color)
+	if (rebuild_color)	// FALSE if tep == NULL
 	{
 		if (tep)
 		{
diff --git a/indra/newview/llviewerjointmesh_sse2.cpp b/indra/newview/llviewerjointmesh_sse2.cpp
index 2648f6af3..ac9d18778 100644
--- a/indra/newview/llviewerjointmesh_sse2.cpp
+++ b/indra/newview/llviewerjointmesh_sse2.cpp
@@ -114,7 +114,7 @@ void LLViewerJointMesh::updateGeometrySSE2(LLFace *face, LLPolyMesh *mesh)
 		((LLV4Matrix3)blend_mat).multiply(normals[index], o_normals[index]);
 	}
 	
-	//setBuffer(0) called in LLVOAvatar::renderSkinned
+	buffer->setBuffer(0);
 }
 bool LLViewerJointMesh::supportsSSE2()
 {
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp
index 13a4e1cef..15a05e13c 100644
--- a/indra/newview/pipeline.cpp
+++ b/indra/newview/pipeline.cpp
@@ -146,21 +146,23 @@ const LLMatrix4* gGLLastMatrix = NULL;
 std::string gPoolNames[] = 
 {
 	// Correspond to LLDrawpool enum render type
-	"NONE",
 	"POOL_SIMPLE",
-	"POOL_TERRAIN",
+	"POOL_TERRAIN",	
 	"POOL_BUMP",
 	"POOL_TREE",
 	"POOL_SKY",
 	"POOL_WL_SKY",
 	"POOL_GROUND",
-	"POOL_INVISIBLE",
-	"POOL_AVATAR",
-	"POOL_WATER",
 	"POOL_GRASS",
 	"POOL_FULLBRIGHT",
+	"POOL_BUMP",
+	"POOL_INVISIBLE",
+	"POOL_AVATAR",
+	"POOL_VOIDWATER",
+	"POOL_WATER",
 	"POOL_GLOW",
 	"POOL_ALPHA",
+	"POOL_INVALID_OUCH_CATASTROPHE_ERROR"
 };
 
 U32 nhpo2(U32 v) 
diff --git a/indra/newview/skins/default/xui/en-us/role_actions.xml b/indra/newview/skins/default/xui/en-us/role_actions.xml
index bac41bc3c..6642743cb 100644
--- a/indra/newview/skins/default/xui/en-us/role_actions.xml
+++ b/indra/newview/skins/default/xui/en-us/role_actions.xml
@@ -108,6 +108,9 @@
 		<action description="Allow &apos;Set Home to Here&apos; on group land"
 		     longdescription="Members in a Role with this Ability can use World menu &gt; Set Home to Here on a parcel deeded to this group."
 		     name="land allow set home" value="28" />
+		<action description="Allow &apos;Event Hosting&apos; on group land"
+		     longdescription="Members in a Role with this Ability can select group owned parcels as venus when hosting an event."
+		     name="land allow host event" value="41" />			 
 	</action_set>
 	<action_set
 	     description="These Abilities include powers to allow or restrict access to group-owned parcels, including freezing and ejecting Residents."