diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-09 21:44:02 -0400 |
commit | 768ef450678a93496fb69012efaa15c915969c47 (patch) | |
tree | 023ead1927667d4fb11cb56dceadc33694d35937 /indra/newview/llfloaterperms.h | |
parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
parent | 33007699cc701baf0c312ff669e659d874f3ae2f (diff) |
Merge suppress http_proxy in INTEGRATION_TEST_llcorehttp
Diffstat (limited to 'indra/newview/llfloaterperms.h')
-rwxr-xr-x | indra/newview/llfloaterperms.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloaterperms.h b/indra/newview/llfloaterperms.h index 2bb0a19dc1..e866b6de7d 100755 --- a/indra/newview/llfloaterperms.h +++ b/indra/newview/llfloaterperms.h @@ -29,6 +29,8 @@ #define LL_LLFLOATERPERMPREFS_H #include "llfloater.h" +#include "lleventcoro.h" +#include "llcoros.h" class LLFloaterPerms : public LLFloater { @@ -80,6 +82,8 @@ private: void refresh(); static const std::string sCategoryNames[CAT_LAST]; + static void updateCapCoro(std::string url); + // cached values only for implementing cancel. bool mShareWithGroup[CAT_LAST]; |