diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 346646c37..57ef25acc 100644
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -3028,7 +3028,7 @@ void LLTextEditor::drawSelectionBackground()
 		{
 			gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 			const LLColor4& color = mReadOnly ? mReadOnlyBgColor : mWriteableBgColor;
-			F32 alpha = hasFocus() ? 1.f : 0.5f;
+			F32 alpha = hasFocus() ? 1.f : 0.8f;
 			gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
 			S32 margin_offset = mShowLineNumbers ? UI_TEXTEDITOR_LINE_NUMBER_MARGIN : 0;
 
diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp
index 7aae068ad..f4b583a53 100644
--- a/indra/newview/lleventnotifier.cpp
+++ b/indra/newview/lleventnotifier.cpp
@@ -39,7 +39,7 @@
 
 #include "llnotify.h"
 #include "lleventinfo.h"
-#include "llfloaterdirectory.h"
+#include "llfloaterevent.h"
 #include "llfloaterworldmap.h"
 #include "llagent.h"
 #include "llappviewer.h"	// for gPacificDaylightTime
@@ -104,8 +104,7 @@ bool LLEventNotifier::handleResponse(U32 eventId, LLVector3d eventPos, const LLS
 		gFloaterWorldMap->trackLocation(eventPos);
 		break;
 	case 1:
-		gDisplayEventHack = TRUE;
-		LLFloaterDirectory::showEvents(eventId);
+		LLFloaterEventInfo::show(eventId);
 		break;
 	case 2:
 		break;
diff --git a/indra/newview/llfloaterdirectory.h b/indra/newview/llfloaterdirectory.h
index e685b8d30..792c578d3 100644
--- a/indra/newview/llfloaterdirectory.h
+++ b/indra/newview/llfloaterdirectory.h
@@ -142,6 +142,4 @@ private:
 	static LLFloaterDirectory	*sInstance;
 };
 
-extern BOOL gDisplayEventHack;
-
 #endif  // LL_LLDIRECTORYFLOATER_H
diff --git a/indra/newview/llpaneldirevents.cpp b/indra/newview/llpaneldirevents.cpp
index 6f5412cef..eed058cc9 100644
--- a/indra/newview/llpaneldirevents.cpp
+++ b/indra/newview/llpaneldirevents.cpp
@@ -52,8 +52,6 @@
 #include "llnotificationsutil.h"
 #include "llviewerregion.h"
 
-BOOL gDisplayEventHack = FALSE;
-
 LLPanelDirEvents::LLPanelDirEvents(const std::string& name, LLFloaterDirectory* floater)
 	:	LLPanelDirBrowser(name, floater),
 	mDoneQuery(FALSE),
@@ -85,12 +83,7 @@ BOOL LLPanelDirEvents::postBuild()
 
 	mCurrentSortColumn = "time";
 
-	if (!gDisplayEventHack)
-	{
-		setDay(0);	// for today
-		//performQuery(); // Temporary change to help DB - Sabin
-	}
-	gDisplayEventHack = FALSE;
+	setDay(0);	// for today
 
 	LLViewerRegion* region(gAgent.getRegion());
 	getChildView("filter_gaming")->setVisible(region && (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS));
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index 1e17dd14a..667a91893 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -45,6 +45,7 @@
 #include "llfloaterregioninfo.h"
 #include "llfloaterscriptdebug.h"
 #include "llfloatersearch.h"
+#include "llfloaterstats.h"
 #include "llhudicon.h"
 #include "llkeyboard.h"
 #include "lllineeditor.h"
@@ -275,6 +276,7 @@ mIsNavMeshDirty(false)
 	addChild(mSGPacketLoss);
 
 	mStatBtn = getChild<LLTextBox>("stat_btn");
+	mStatBtn->setClickedCallback(boost::bind(LLFloaterStats::toggleInstance, LLSD()));
 }
 
 LLStatusBar::~LLStatusBar()
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 1a389ab05..d4ea905af 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -1889,6 +1889,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
 	capabilityNames.append("AgentState");
 	capabilityNames.append("AttachmentResources");
 	//capabilityNames.append("AvatarPickerSearch"); //Display name/SLID lookup (llfloateravatarpicker.cpp)
+	capabilityNames.append("AvatarRenderInfo");
 	capabilityNames.append("CharacterProperties");
 	capabilityNames.append("ChatSessionRequest");
 	capabilityNames.append("CopyInventoryFromNotecard");