Commit Graph

76 Commits (56da70fa9651164e577caaf866fccec684bbd577)

Author SHA1 Message Date
Ansariel e6f9a5e2db Merge viewer64 2017-07-27 21:07:14 +02:00
Nicky c4d7f25bac Merge with phoenix-firestorm-lgpl. 2017-05-23 14:09:46 +02:00
Nat Goodspeed fe64db61d6 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-22 21:30:26 -04:00
Ansariel dcac0dce59 Merge viewer-bear 2017-05-07 13:11:50 +02:00
andreykproductengine 0dcb423cf3 MAINT-7145 Eliminate LLSingleton circular references 2017-04-25 17:48:34 +03:00
Nat Goodspeed 434f0e161a Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-02-03 09:54:52 -05:00
Nicky 2290d5ed16 Merge with viewer64, first pass. 2017-01-10 19:33:15 +01:00
Nat Goodspeed 42b8895c54 DRTVWR-418: Untangle LLWLParamKey, LLWLAnimator circularity.
LLWLAnimator stores a std::map<F32, LLWLParamKey>. But llwlanimator.h only
forward-declared LLWLParamKey, begging the question of how this ever compiled
on any previous platform.

LLWLParamKey was declared for real in llwlparammanager.h, so the obvious fix
is to #include "llwlparammanager.h" in llwlanimator.h. Unfortunately this
doesn't work because llwlparammanager.h already #includes "llwlanimator.h".

As the dependency is specifically on LLWLParamKey, which isa LLEnvKey, which
is declared in llenvmanager.h, move LLWLParamKey to llenvmanager.h. Then we
can #include "llenvmanager.h" in llwlanimator.h instead of merely forward-
declaring LLWLParamKey.

This migration compiles LLWLParamKey in a context in which LLTrans isn't
visible. It's not really clear why all LLWLParamKey's methods are inline, but
toString() -- the method that requires LLTrans -- isn't going to be fast in
any case. Break toString() out to llenvmanager.cpp, and #include "lltrans.h"
there.
2016-12-20 09:33:40 -05:00
Ansariel c9e2432650 FIRE-8633 / MAINT-2141: Go with the LL fix for now 2016-11-30 19:32:03 +01:00
Ansariel e2919977d6 Merge viewer-lynx 2016-11-30 11:15:04 +01:00
andreykproductengine c74d1acbfc MAINT-2141 Fix for Sky Cloud Coverage reverting. 2016-11-18 20:59:30 +02:00
Ansariel 9800acf862 Parcel WL crossfading option is totally broken and crossfades into everything but the correct WL. And since the whole WL code in the viewer is a huge pile of mess, rather dump the option than regularly show the wrong WL 2016-10-10 12:15:16 +02:00
Ansariel 5e451e7131 FIRE-6563: Use region water WL settings if no parcel WL water settings have been defined 2016-10-10 10:04:52 +02:00
Ansariel 5d6c41dad0 FIRE-6563: Windlight settings not getting properly applied after teleport 2016-10-09 12:02:20 +02:00
Ansariel 6006df3f62 FIRE-19972: Parcel WL might be overridden by region environment settings if region caps and region environment settings arrive after parcel properties 2016-09-29 21:15:52 +02:00
Ansariel 67b2092cc2 FIRE-19422: Newly created Windlight presets don't appear in Quickprefs until relog 2016-06-06 11:56:15 +02:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Kadah_Coba aa55d3a9c4 FIRE-17276: A different method handling parcel change
Updated comments in LL modules
2015-11-15 00:51:41 -08:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Mnikolenko ProductEngine 172dc08a0f MAINT-2477 FIXED Environment settings won't persist across logins by default, but it may be changed by using EnvironmentPersistAcrossLogin setting 2014-10-10 11:50:41 +03:00
Ansariel 287a8b0d3b FIRE-14124: Fix some more occurances where the sun position check mark in the main menu gets broken 2014-07-18 10:20:01 +02:00
Tank_Master 8863d9beaf Compile fixes 2014-06-09 23:27:05 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Ansariel 1db06992f4 Compile fix 2014-02-07 20:42:21 +01:00
Tank_Master 7b2cc02863 Merge LL fitted mesh 2014-02-06 00:41:33 -08:00
Oz Linden fcc885d4fc replace uses of LLEnvManagerNew::setRegionChangeCallback with LLAgent::addRegionChangedCallback 2013-11-19 15:51:27 -05:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Ansariel 197f4039d0 FIRE-4978/FIRE-7847: Major rewrite of the Windlight controls in quick preferences and phototools:
* Added checkbox that will show if region windlight settings are used and can also enable/disable usage of them
* Added combobox for day cycle presets
* The sky preset combobox will show "Day cycle based", if the current sky preset is defined by the selected day cycle and time of day
* The sky preset combobox will show "Region default", if the current sky preset is based on region windlight
* The water preset combobox will show "Region default", if the current water preset is based on region windlight
* The day cycle combobox will show "Region default", if the current day cycle preset is based on region windlight
* The day cycle combobox will show "None", if no day cycle preset is active (if a sky preset is chosen)
* Changing either sky, water or day cycle preset will disable region windlight and persist as user setting
* The slider will either change day of time (day cycle active) or sun position (sky preset chosen)
* Reset to region defaults button will reset sky and water to region defaults, but not enable region windlight and not persist
  (not doing so would disallow us from changing either sky or water)
* Disabling region windlight will load previously chosen sky, water and day cycle preset (this is intentional because of the implementation of the basic Windlight functionality)
2013-03-08 20:52:15 +01:00
Cinders 718aecb2ee FIRE-8063: Add support for Aurora-sim WindlightRefresh message 2012-11-24 13:40:00 -07:00
Kitty Barnett 8ab7f87d53 Merged with RLVa-1.4.6 tip 2012-06-27 16:40:29 +02:00
Kitty Barnett a47c2185c3 - fixed : @setenv_preset:<name>=force and @setenv_daycycle:<name>=force don't change the current sky preset or day cycle
--HG--
branch : RLVa
2011-09-04 23:48:57 +02:00
Kitty Barnett e8d4c2f5f0 - internal : rewrite of the @getenv_XXX and @setenv_XXX Windlight commands
--HG--
branch : RLVa
2011-08-30 00:02:57 +02:00
Oz Linden 9963e9aaac fix license headers 2011-08-04 11:00:53 -04:00
Vadim ProductEngine 31c1cff64f STORM-1262 FIXED Removed the original Windlight Region Settings implementation. 2011-07-06 00:42:28 +03:00
Vadim ProductEngine ab431d1774 STORM-1305 WIP User day cycles now go first in all lists. 2011-06-14 18:04:29 +03:00
Vadim ProductEngine 4fd946fa3e STORM-1305 WIP User sky presets now go first in all lists. 2011-06-10 23:44:13 +03:00
Vadim ProductEngine 23d8fb9750 STORM-1305 WIP User water presets now go first in all lists.
Besides, removed all cases of direct access to the water presets map in preparation for future lazy loading.
2011-06-10 21:21:04 +03:00
Vadim ProductEngine 150c18169d STORM-1305 WIP Made LLWaterParamManager::mParamList private and typedef'ed its type. 2011-06-10 19:55:30 +03:00
Vadim ProductEngine 0d1cc56eb1 STORM-1279 FIXED Changing sky preset with a keyboard shortcut now updates the Environment Settings floater.
Changes:
* Subscribed the floater to the "settings changed" signal of the environment manager.
* Rewrote the floater to not modify settings only when the Save button is pressed.
* Refactoring to eliminate code duplication.
2011-06-10 18:21:32 +03:00
Vadim ProductEngine a7603c8487 STORM-1279 WIP Renamed a method. 2011-06-09 21:56:33 +03:00
Vadim ProductEngine 9f4779e099 STORM-1255 WIP Made the check for region permissions reusable. 2011-06-06 23:46:35 +03:00
Vadim ProductEngine e184c75986 STORM-1253 WIP Changed the workflow to modify region day cycle.
Was: Press "Save" after editing the region day cycle in the Day Cycle Editor.
Now:
- Press "Save" in the Day Cycle Editor.
- Open Region / Estate -> Environment tab.
- Select the region day cycle.
- Press "Apply".
2011-06-02 18:56:49 +03:00
Vadim ProductEngine dda7df4ac9 STORM-1253 WIP Debugging stuff. 2011-06-02 18:35:23 +03:00
Vadim ProductEngine 657e434fd5 STORM-1253 WIP New day cycle editor.
Done:
* Creating new local day cycles.
* Editing existing local day cycles.
* Deleting day cycles.

To do:
* Editing region day cycle, dealing with skies in region scope.
* Handle teleport while editing a day cycle.
* Update UI when a day cycle or sky preset gets deleted.
* Make the time ctrl increase/decrease consistently.
2011-05-30 22:34:56 +03:00
Vadim ProductEngine c0037909d5 STORM-1284 FIXED Changes to region environment are now visible immediately.
Pressing "Apply" sends the settings update to server.
Pressing "Cancel" reverts to current region settings.
2011-05-26 19:32:20 +03:00