ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
5a51a43f23
Fix eol at eof on wl param files.
2013-03-12 08:45:10 -07:00
c4084c7138
SH-2592 PROGRESS -- (OS X Lion) Graphics issues with Atmospheric Shaders enabled on Intel HD 3000, 10.7.2
...
Refactored WindLight estate settings to use float uniforms in the shaders that
only need it, rather than vec4's for everything.
2012-01-30 15:29:53 -08:00
4fd946fa3e
STORM-1305 WIP User sky presets now go first in all lists.
2011-06-10 23:44:13 +03:00
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
173b9d11c4
STORM-1254 WIP Implemented created and editing local water presets.
2011-06-09 16:38:51 +03:00
7151a4e6b0
STORM-1255 WIP Consistency pass on sky presets removal.
...
* Update all related floaters when a sky preset gets removed.
* Don't allow removing skies referenced by (local) day cycles.
* Other minor fixes.
2011-06-07 17:41:26 +03:00
4e05ea6ebd
STORM-1255 WIP Implemented creating, editing and removing local sky presets.
2011-06-07 00:17:21 +03:00
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
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
c32b19f31d
STORM-1253 WIP Implemented switching between multiple day cycles (locally and region-wide).
2011-05-26 15:11:01 +03:00
747a7541a5
STORM-1256 WIP Fixed a crash.
2011-05-23 23:08:14 +03:00
b60c63bf07
STORM-1256 WIP Implemented editing region environment settings via the Region/Estate floater.
2011-05-23 19:26:17 +03:00
0c358f78ab
STORM-1269 FIXED Teleport to a region that has no env. settings now resets environment to defaults.
2011-05-19 21:10:34 +03:00
348218e40f
STORM-1245 WIP Restored environment settings interpolation on region crossing.
...
Also got rid of duplicated region environment settings requests.
2011-05-17 16:26:55 +03:00
cccca566bd
STORM-1245 WIP Reimplementing management of local presets according to the new spec.
...
User environment preferences are now persistent.
TODO: Implement applying region env. settings.
2011-05-16 17:17:01 +03:00
48309dcb3f
STORM-1126 WIP Windlight Estate Settings integration: pass 8
...
Eliminated more merge artifacts (superflous copyright changes).
2011-03-31 18:24:01 +03:00
79fb8e2ec2
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.
2011-03-31 18:24:01 +03:00
e045d212d3
STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at merging in windlight estate settings to viewer-dev codebase.
...
not built, not tested. Probably needs a bunch of fixes to be able
to be integrated.
(resubmitted by Vadim ProductEngine)
2010-09-27 22:56:08 -04:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
875606a04d
QAR-566 maint-viewer-5-merge-2
...
Effective merge: release@84102 maint-viewer-5@86348 -> maint-viewer-5-merge-2
Actual merge maint-viewer-5-merge-2 -r 87239 : 87246 -> release
2008-05-11 20:56:42 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
simon