diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-26 11:39:16 -0500 | 
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-11-26 11:39:16 -0500 | 
| commit | c7c549b7e24af3b9ee87d464a03adeab75ee6553 (patch) | |
| tree | 73176ed66ad84a78e2eecd1ac7e7425d60965c13 /indra/newview | |
| parent | 13b4909a3ca066105695afc174642409daa46df2 (diff) | |
LLFloaterPermsResponder switched to new Responder API
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/app_settings/logcontrol.xml | 1 | ||||
| -rwxr-xr-x | indra/newview/llfloaterperms.cpp | 11 | 
2 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/app_settings/logcontrol.xml b/indra/newview/app_settings/logcontrol.xml index 15cb5bc0eb..29639bb9c2 100755 --- a/indra/newview/app_settings/logcontrol.xml +++ b/indra/newview/app_settings/logcontrol.xml @@ -42,6 +42,7 @@  						</array>  					<key>tags</key>  						<array> +						     <string>Avatar</string>  						<!-- sample entry for debugging specific items	  						     <string>Inventory</string>  						     <string>SceneLoadTiming</string> diff --git a/indra/newview/llfloaterperms.cpp b/indra/newview/llfloaterperms.cpp index 0880a5f35a..849aa7cd14 100755 --- a/indra/newview/llfloaterperms.cpp +++ b/indra/newview/llfloaterperms.cpp @@ -35,6 +35,8 @@  #include "llagent.h"  #include "llviewerregion.h"  #include "llnotificationsutil.h" +#include "llsdserialize.h" +#include "llvoavatar.h"  LLFloaterPerms::LLFloaterPerms(const LLSD& seed)  : LLFloater(seed) @@ -171,8 +173,9 @@ public:  private:  	static	std::string sPreviousReason; -	void error(U32 status, const std::string& reason) +	void httpFailure()  	{ +		const std::string& reason = getReason();  		// Do not display the same error more than once in a row  		if (reason != sPreviousReason)  		{ @@ -182,8 +185,12 @@ private:  			LLNotificationsUtil::add("DefaultObjectPermissions", args);  		}  	} -	void result(const LLSD& content) + +	void httpSuccess()  	{ +		//const LLSD& content = getContent(); +		//dump_sequential_xml("perms_responder_result.xml", content); +  		// 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.  		sPreviousReason = "";  | 
