summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llfloaterperms.cpp12
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)