Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Solve SV-2042: Description on event notice now opens a floater, not search.

Browse Source
This commit is contained in:
Lirusaito
2016-06-05 13:26:12 -04:00
parent 6847833752
commit 548d1b6757
3 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/lleventnotifier.cpp
View File

@@ -39,7 +39,7 @@
#include "llnotify.h" #include "llnotify.h"
#include "lleventinfo.h" #include "lleventinfo.h"
#include "llfloaterdirectory.h" #include "llfloaterevent.h"
#include "llfloaterworldmap.h" #include "llfloaterworldmap.h"
#include "llagent.h" #include "llagent.h"
#include "llappviewer.h" // for gPacificDaylightTime #include "llappviewer.h" // for gPacificDaylightTime
@@ -104,8 +104,7 @@ bool LLEventNotifier::handleResponse(U32 eventId, LLVector3d eventPos, const LLS
gFloaterWorldMap->trackLocation(eventPos); gFloaterWorldMap->trackLocation(eventPos);
break; break;
case 1: case 1:
gDisplayEventHack = TRUE; LLFloaterEventInfo::show(eventId);
LLFloaterDirectory::showEvents(eventId);
break; break;
case 2: case 2:
break; break;

2
indra/newview/llfloaterdirectory.h
View File

@@ -142,6 +142,4 @@ private:
static LLFloaterDirectory *sInstance; static LLFloaterDirectory *sInstance;
}; };
extern BOOL gDisplayEventHack;
#endif // LL_LLDIRECTORYFLOATER_H #endif // LL_LLDIRECTORYFLOATER_H

9
indra/newview/llpaneldirevents.cpp
View File

@@ -52,8 +52,6 @@
#include "llnotificationsutil.h" #include "llnotificationsutil.h"
#include "llviewerregion.h" #include "llviewerregion.h"
BOOL gDisplayEventHack = FALSE;
LLPanelDirEvents::LLPanelDirEvents(const std::string& name, LLFloaterDirectory* floater) LLPanelDirEvents::LLPanelDirEvents(const std::string& name, LLFloaterDirectory* floater)
: LLPanelDirBrowser(name, floater), : LLPanelDirBrowser(name, floater),
mDoneQuery(FALSE), mDoneQuery(FALSE),
@@ -85,12 +83,7 @@ BOOL LLPanelDirEvents::postBuild()
mCurrentSortColumn = "time"; mCurrentSortColumn = "time";
if (!gDisplayEventHack) setDay(0); // for today
{
setDay(0); // for today
//performQuery(); // Temporary change to help DB - Sabin
}
gDisplayEventHack = FALSE;
LLViewerRegion* region(gAgent.getRegion()); LLViewerRegion* region(gAgent.getRegion());
getChildView("filter_gaming")->setVisible(region && (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS)); getChildView("filter_gaming")->setVisible(region && (gAgent.getRegion()->getGamingFlags() & REGION_GAMING_PRESENT) && !(gAgent.getRegion()->getGamingFlags() & REGION_GAMING_HIDE_FIND_EVENTS));