diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-04-01 03:56:20 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-04-01 03:56:20 +0300 |
| commit | eb413ec41e6ee49055464a636a73a7243c172c67 (patch) | |
| tree | 55e5a352f118777b7b911b5c613613bd18dc091e /indra/newview/llfloaterregioninfo.h | |
| parent | 18cd32443a552e4f115d1b2913f262b385766cdf (diff) | |
| parent | 18928ea6c6f2830a0d45ec412c915eceff1b76b0 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
| -rwxr-xr-x | indra/newview/llfloaterregioninfo.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 7bbd1b79ee..46f2b42137 100755 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -36,6 +36,7 @@ #include "llextendedstatus.h" #include "llenvmanager.h" // for LLEnvironmentSettings +#include "lleventcoro.h" class LLAvatarName; class LLDispatcher; @@ -107,6 +108,8 @@ private: LLFloaterRegionInfo(const LLSD& seed); ~LLFloaterRegionInfo(); + + protected: void onTabSelected(const LLSD& param); @@ -483,6 +486,8 @@ public: private: void refreshRegionExperiences(); + static std::string regionCapabilityQuery(LLViewerRegion* region, const std::string &cap); + LLPanelExperienceListEditor* setupList(const char* control_name, U32 add_id, U32 remove_id); static LLSD addIds( LLPanelExperienceListEditor* panel ); |