diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-03-31 18:24:01 +0300 |
| commit | 79fb8e2ec26dc2c5a42ef1ee48ebaaa39183c67b (patch) | |
| tree | 2747ceb9c211f677be9a595ba91b75e71506c529 /indra/newview/llfloaterregioninfo.h | |
| parent | 5476999e9dfeca48009b43e4fcc0967be5540572 (diff) | |
STORM-1126 WIP Windlight Estate Settings integration: pass 4
Changes:
* Fixed incorrect way to pass parameters to notifications.
* Fixed crashes in the Advanced Sky floater and the Region Terrain panel.
* Fixed initialization and multiple instantiation of the Day Cycle floater
(that might lead to incorrect behavior).
* Fixed and re-enabled committing env. settings changes to region.
* Fixed day cycle and sky settings being sent as empty arrays and therefore not passing validation on server.
It is now possible to change region environment settings.
* Added debug messages.
Diffstat (limited to 'indra/newview/llfloaterregioninfo.h')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index bb5afeb70b..b936900abc 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -73,7 +73,7 @@ public: /*virtual*/ void onOpen(const LLSD& key); /*virtual*/ BOOL postBuild(); - /*virtual*/void closeFloater(bool app_quitting); + /*virtual*/ void onClose(bool app_quitting); static void processEstateOwnerRequest(LLMessageSystem* msg, void**); @@ -87,6 +87,7 @@ public: static LLPanelEstateInfo* getPanelEstate(); static LLPanelEstateCovenant* getPanelCovenant(); + static LLPanelRegionTerrainInfo* getPanelRegionTerrain(); // from LLPanel virtual void refresh(); @@ -232,13 +233,15 @@ protected: ///////////////////////////////////////////////////////////////////////////// class LLPanelRegionTerrainInfo : public LLPanelRegionInfo { + LOG_CLASS(LLPanelRegionTerrainInfo); + public: LLPanelRegionTerrainInfo() : LLPanelRegionInfo() {} ~LLPanelRegionTerrainInfo() {} static LLPanelRegionTerrainInfo* instance(); virtual BOOL postBuild(); // LLPanel - static void closeFloater(bool app_quitting); + static void onFloaterClose(bool app_quitting); F32 getSunHour(); virtual bool refreshFromRegion(LLViewerRegion* region); // refresh local settings from region update from simulator |