diff options
| author | Jonathan Yap <none@none> | 2013-12-05 14:42:14 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-12-05 14:42:14 -0500 |
| commit | 096530b7265223ade02a86977973b7e5df12e93c (patch) | |
| tree | 97f33be7ea164a4ec5a38a56421023434f4432cc | |
| parent | 944840c8b164aa0f254d3d0eb38292a49b0dcae6 (diff) | |
STORM-68 Get display error message once to work properly
| -rwxr-xr-x | indra/newview/llfloaterperms.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index 28fb76160a..b4ea34d5f1 100755 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -160,15 +160,15 @@ class LLFloaterPermsResponder : public LLHTTPClient::Responder public: LLFloaterPermsResponder(): LLHTTPClient::Responder() {} private: - std::string mPreviousReason; + static std::string sPreviousReason; void error(U32 status, const std::string& reason) { -llwarns << "DBG !" << mPreviousReason << "!" << llendl; +llwarns << "DBG !" << sPreviousReason << "!" << llendl; // Do not display the same error more than once in a row - if (reason != mPreviousReason) + if (reason != sPreviousReason) { - mPreviousReason = reason; + sPreviousReason = reason; LLSD args; args["REASON"] = reason; LLNotificationsUtil::add("DefaultObjectPermissions", args); @@ -178,12 +178,14 @@ llwarns << "DBG !" << mPreviousReason << "!" << llendl; { // 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. - mPreviousReason = ""; + sPreviousReason = ""; LLFloaterPermsDefault::setCapSent(true); LL_INFOS("FloaterPermsResponder") << "Sent default permissions to simulator" << LL_ENDL; } }; + std::string LLFloaterPermsResponder::sPreviousReason; + void LLFloaterPermsDefault::sendInitialPerms() { if(!mCapSent) |