From 548d1b675765d60dc16ccd8ad7e97beeb98d2cb9 Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Sun, 5 Jun 2016 13:26:12 -0400
Subject: [PATCH] Solve SV-2042: Description on event notice now opens a
 floater, not search.

---
 indra/newview/lleventnotifier.cpp  | 5 ++---
 indra/newview/llfloaterdirectory.h | 2 --
 indra/newview/llpaneldirevents.cpp | 9 +--------
 3 files changed, 3 insertions(+), 13 deletions(-)

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));