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

Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/llspeakers.cpp
Compile fixes:
	indra/newview/llgroupmgr.cpp - uncomment new API for GroupBanDataResponder
This commit is contained in:
Inusaito Sayori
2014-07-21 19:56:35 -04:00
parent bf9d3acf33 74dff061ff
commit b9ba472eda
78 changed files with 749 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llfloaterperms.cpp
View File

@@ -231,7 +231,7 @@ public:
private:
static std::string sPreviousReason;
void error(U32 status, const std::string& reason)
void httpFailure(void)
{
// <singu> Prevent 404s from annoying the user all the tme
if (status == HTTP_NOT_FOUND)
@@ -239,15 +239,15 @@ private:
else
// </singu>
// Do not display the same error more than once in a row
if (reason != sPreviousReason)
if (mReason != sPreviousReason)
{
sPreviousReason = reason;
sPreviousReason = mReason;
LLSD args;
args["REASON"] = reason;
args["REASON"] = mReason;
LLNotificationsUtil::add("DefaultObjectPermissions", args);
}
}
void result(const LLSD& content)
void httpSuccess(void)
{
// Since we have had a successful POST call be sure to display the next error message
// even if it is the same as a previous one.