Permalink
Browse files

Solve SV-2042: Description on event notice now opens a floater, not s…

…earch.
  • Loading branch information...
Lirusaito committed Jun 5, 2016
1 parent 6847833 commit 548d1b675765d60dc16ccd8ad7e97beeb98d2cb9
Showing with 3 additions and 13 deletions.
  1. +2 −3 indra/newview/lleventnotifier.cpp
  2. +0 −2 indra/newview/llfloaterdirectory.h
  3. +1 −8 indra/newview/llpaneldirevents.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;
@@ -142,6 +142,4 @@ class LLFloaterDirectory : public LLFloater
static LLFloaterDirectory *sInstance;
};
-extern BOOL gDisplayEventHack;
-
#endif // LL_LLDIRECTORYFLOATER_H
@@ -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));

0 comments on commit 548d1b6

Please sign in to comment.