summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterregioninfo.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-07-09 12:30:57 -0400
committerOz Linden <oz@lindenlab.com>2015-07-09 12:30:57 -0400
commitc2f9c5ac8189b8076d51711c3be09dfbe309e22b (patch)
tree0c0a469645c77c62ff0456d2230cb6b2c3e996c0 /indra/newview/llfloaterregioninfo.h
parentc91205c47627e46369d3a2e183de7a4157c051a8 (diff)
parent4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff)
merge changes for 3.8.0-release
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
-rwxr-xr-xindra/newview/llfloaterregioninfo.h34
1 files changed, 34 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h
index 792f60ebc8..e7b49d8553 100755
--- a/indra/newview/llfloaterregioninfo.h
+++ b/indra/newview/llfloaterregioninfo.h
@@ -60,6 +60,9 @@ class LLPanelRegionDebugInfo;
class LLPanelRegionTerrainInfo;
class LLPanelEstateInfo;
class LLPanelEstateCovenant;
+class LLPanelExperienceListEditor;
+class LLPanelExperiences;
+class LLPanelRegionExperiences;
class LLEventTimer;
class LLEnvironmentSettings;
@@ -90,6 +93,7 @@ public:
static LLPanelEstateInfo* getPanelEstate();
static LLPanelEstateCovenant* getPanelCovenant();
static LLPanelRegionTerrainInfo* getPanelRegionTerrain();
+ static LLPanelRegionExperiences* getPanelExperiences();
// from LLPanel
virtual void refresh();
@@ -453,4 +457,34 @@ private:
LLComboBox* mDayCyclePresetCombo;
};
+class LLPanelRegionExperiences : public LLPanelRegionInfo
+{
+ LOG_CLASS(LLPanelEnvironmentInfo);
+
+public:
+ LLPanelRegionExperiences(){}
+ /*virtual*/ BOOL postBuild();
+ virtual BOOL sendUpdate();
+
+ static bool experienceCoreConfirm(const LLSD& notification, const LLSD& response);
+ static void sendEstateExperienceDelta(U32 flags, const LLUUID& agent_id);
+
+ static void infoCallback(LLHandle<LLPanelRegionExperiences> handle, const LLSD& content);
+ bool refreshFromRegion(LLViewerRegion* region);
+ void sendPurchaseRequest()const;
+ void processResponse( const LLSD& content );
+private:
+ void refreshRegionExperiences();
+
+ LLPanelExperienceListEditor* setupList(const char* control_name, U32 add_id, U32 remove_id);
+ static LLSD addIds( LLPanelExperienceListEditor* panel );
+
+ void itemChanged(U32 event_type, const LLUUID& id);
+
+ LLPanelExperienceListEditor* mTrusted;
+ LLPanelExperienceListEditor* mAllowed;
+ LLPanelExperienceListEditor* mBlocked;
+ LLUUID mDefaultExperience;
+};
+
#endif