diff options
| author | RevolutionSmythe | 2010-10-20 16:31:09 -0500 |
|---|---|---|
| committer | McCabe Maxsted | 2010-11-01 16:58:02 -0700 |
| commit | af6877fbfe94e80948c559cf77f008049f8168dc (patch) | |
| tree | 4fe687aaec6a1b964a0e989d3c03c143b4ab07f6 /linden/indra/newview/llfloaterenvsettings.h | |
| parent | Merge remote branch 'thickbrick/weekly' into weekly (diff) | |
| download | meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.zip meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.gz meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.bz2 meta-impy-af6877fbfe94e80948c559cf77f008049f8168dc.tar.xz | |
Finishes the OpenRegionSettings module, adds a new panel to Region/Estate for OpenRegionSettings, adds the new CAPS based WindLight Settings module, cleans up a few UI parts, and rebuilds the ToS window to support OpenSim regions better.
Diffstat (limited to 'linden/indra/newview/llfloaterenvsettings.h')
| -rw-r--r-- | linden/indra/newview/llfloaterenvsettings.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/llfloaterenvsettings.h b/linden/indra/newview/llfloaterenvsettings.h index 49bf4fd..8b44621 100644 --- a/linden/indra/newview/llfloaterenvsettings.h +++ b/linden/indra/newview/llfloaterenvsettings.h | |||
| @@ -78,6 +78,9 @@ public: | |||
| 78 | /// open the advanced water settings menu | 78 | /// open the advanced water settings menu |
| 79 | static void onOpenAdvancedWater(void* userData); | 79 | static void onOpenAdvancedWater(void* userData); |
| 80 | 80 | ||
| 81 | /// open the windlight manager floater | ||
| 82 | static void onOpenWLManager(void* userData); | ||
| 83 | |||
| 81 | /// submit windlight settings to the estate | 84 | /// submit windlight settings to the estate |
| 82 | static void onSubmitWindlight(void* userData); | 85 | static void onSubmitWindlight(void* userData); |
| 83 | 86 | ||