diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-10-18 15:38:33 -0400 |
| commit | 8e30a2f06dd1ce407fcb2399823efed883b317d2 (patch) | |
| tree | e5b22fb9fd2b5e99cf195d00338da57ecdade0d4 /indra/newview/llfloaterregioninfo.h | |
| parent | 7df153e352ce50ded382df020cc3696b8c1b9325 (diff) | |
| parent | 086c1342152895da28d2e0130d09432152604ca8 (diff) | |
merge changes for 4.1.1-release
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 46f2b42137..dbb0ad05e9 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -95,6 +95,7 @@ public: static LLPanelEstateCovenant* getPanelCovenant(); static LLPanelRegionTerrainInfo* getPanelRegionTerrain(); static LLPanelRegionExperiences* getPanelExperiences(); + static LLPanelRegionGeneralInfo* getPanelGeneral(); // from LLPanel virtual void refresh(); @@ -183,6 +184,9 @@ public: // LLPanel virtual BOOL postBuild(); + void onBtnSet(); + void setObjBonusFactor(F32 object_bonus_factor) {mObjBonusFactor = object_bonus_factor;} + protected: virtual BOOL sendUpdate(); void onClickKick(); @@ -191,6 +195,9 @@ protected: bool onKickAllCommit(const LLSD& notification, const LLSD& response); static void onClickMessage(void* userdata); bool onMessageCommit(const LLSD& notification, const LLSD& response); + bool onChangeObjectBonus(const LLSD& notification, const LLSD& response); + + F32 mObjBonusFactor; }; |