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

Fix reporter spawning notifications over and over

Browse Source 
The user needs only one per session if that.
Also no longer have reporter processRegionInfo when it doesn't use that.
This commit is contained in:
Lirusaito
2019-01-06 09:46:14 -05:00
parent 252fdcdd1e
commit 13816b696f
3 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/llfloaterreporter.cpp
View File

@@ -111,17 +111,6 @@ LLFloaterReporter::LLFloaterReporter()
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_report_abuse.xml");
}
// static
void LLFloaterReporter::processRegionInfo(LLMessageSystem* msg)
{
U32 region_flags;
msg->getU32("RegionInfo", "RegionFlags", region_flags);
if (LLFloaterReporter::instanceExists() && LLFloaterReporter::getInstance()->getVisible())
{
LLNotificationsUtil::add("HelpReportAbuseEmailLL");
}
}
// virtual
BOOL LLFloaterReporter::postBuild()
{
@@ -155,6 +144,7 @@ BOOL LLFloaterReporter::postBuild()
mDefaultSummary = getChild<LLUICtrl>("details_edit")->getValue().asString();
/* Singu Note: We only used this to trigger the notification that's now below, there's no point to this anymore.
// send a message and ask for information about this region -
// result comes back in processRegionInfo(..)
LLMessageSystem* msg = gMessageSystem;
@@ -163,6 +153,8 @@ BOOL LLFloaterReporter::postBuild()
msg->addUUID("AgentID", gAgent.getID());
msg->addUUID("SessionID", gAgent.getSessionID());
gAgent.sendReliableMessage();
*/
LLNotificationsUtil::add("HelpReportAbuseEmailLL");
// abuser name is selected from a list

4
indra/newview/llfloaterreporter.h
View File

@@ -38,7 +38,6 @@
#include "v3math.h"
class LLAvatarName;
class LLMessageSystem;
class LLViewerTexture;
class LLInventoryItem;
class LLViewerObject;
@@ -104,9 +103,6 @@ public:
static void addDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
static void setDescription(const std::string& description, LLMeanCollisionData *mcd = NULL);
// static
static void processRegionInfo(LLMessageSystem* msg);
void setPickedObjectProperties(const std::string& object_name, const std::string& owner_name, const LLUUID owner_id);
private:

2
indra/newview/llviewerregion.cpp
View File

@@ -63,7 +63,6 @@
#include "llfloateravatarlist.h"
#include "llfloatergodtools.h"
#include "llfloaterperms.h"
#include "llfloaterreporter.h"
#include "llfloaterregioninfo.h"
#include "llhttpnode.h"
#include "llregioninfomodel.h"
@@ -904,7 +903,6 @@ void LLViewerRegion::processRegionInfo(LLMessageSystem* msg, void**)
LLRegionInfoModel::instance().update(msg);
LLFloaterGodTools::processRegionInfo(msg);
LLFloaterRegionInfo::processRegionInfo(msg);
LLFloaterReporter::processRegionInfo(msg);
}
void LLViewerRegion::setCacheID(const LLUUID& id)