summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2018-09-14Merged in graham_linden/viewer-eep-graham (pull request #87)Rider Linden
SL-1491
2018-09-14SL-1491Graham Linden
Fix name at top of the 3 softenLight shaders so we can differentiate which is in use when using nSight debug. Made class2 softenLightF shader modulate the atmospherics additive to only specular shading to fix lens flare on terrain etc.
2018-09-14SL-1556: Correctly identify when the selected parcel is in another region ↵Rider Linden
and display a message about cross region environments.
2018-09-14Merged in andreykproductengine/maint-eep (pull request #86)Rider Linden
SL-9653 Multy slider edge overlap cases Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2018-09-14Merged in maxim_productengine/viewer-eep (pull request #85)Rider Linden
SL-9656 and SL-9652 fixed
2018-09-14Merged in graham_linden/viewer-eep-graham (pull request #84)Rider Linden
SL-1872
2018-09-14SL-9653 EEP Blender abruptly jumps from correct value to initialandreykproductengine
2018-09-14SL-9653 Multy slider edge overlap casesandreykproductengine
2018-09-14SL-9652 FIXED EEP Not allowed characters can be used for Environment Assets namemaxim_productengine
2018-09-14SL-9656 FIXED EEP viewer crash after opening About Land and then ↵maxim_productengine
right-clicking a Day Cycle in Inventory
2018-09-14SL-1872 make daycycle water editor normal map texture control use proper ↵Graham Linden
blank normal map asset
2018-09-13Spruce up the non-ALM stars too.Graham Linden
2018-09-13Explicit cast for LLUIColorRider Linden
2018-09-13Remove optimize pragma for macRider Linden
2018-09-13Merged in andreykproductengine/maint-eep2 (pull request #82)Rider Linden
SL-1168 and SL-1307
2018-09-13Merged in andreykproductengine/maint-eep (pull request #78)Rider Linden
SL-1961 Icon support for multislider and icons on altitudes slider Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com> Approved-by: Rider Linden <rider@lindenlab.com> Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
2018-09-13SL-1307 EEP At startup viewer does not recognize what parcel you are on.andreykproductengine
2018-09-13SL-9625 EEP "Save As" and "Save" are initially unavailable in Day Cyclemaxim_productengine
2018-09-13SL-1168 EEP Shouldn't be possible to create more than 20 keframesandreykproductengine
2018-09-13SL-984 Disable creating EEP settings under Lost and Found foldermaxim_productengine
2018-09-12MergeRider Linden
2018-09-12SL-1402, SL-1193, SL-976: Corrected strings and layout for named bugsRider Linden
("Use Shared Environment", no selection format in panel, Missing String in give object) Also Rider learned how to spell Committed
2018-09-13SL-1127 fix sky tex update with EEP interpolation getting confusedGraham Linden
Disable RenderUseAdvancedAtmospherics in feature table to prevent Ultra from turning it on before its time.
2018-09-12Fix for hanging W64 builds from llcorehttp refcount testsGraham Linden
2018-09-12SL-9634 turn off nSight debug setting breaking snapshots (glReadPixels is ↵Graham Linden
incompatible with nSight debugging)
2018-09-12SL-9635 remove init of libatmosphere causing crashes on Intel HDGraham Linden
2018-09-12SL-1961 Icon support for multislider and icons on altitudes sliderandreykproductengine
2018-09-11SL-9626: When the panel loses visibility the picker is now automatically ↵Rider Linden
closed. Also picker checks handle to parent rather than pointer to parent.
2018-09-11Good grief OSXRider Linden
2018-09-11OSX gets anoyingly cranky if I don't use a variable.Rider Linden
2018-09-11SL-9620: Double check that commit actually passes back a day cycle from the ↵Rider Linden
editor. Also hide the altitude setting interface for the moment.
2018-09-11Merged in graham_linden/viewer-eep-graham (pull request #77)Rider Linden
SL-1936 and SL-1912 WIP
2018-09-11Merge TC CMake fixGraham Linden
2018-09-11Merge advanced atmo WIPGraham Linden
2018-09-11Hide UI related to advanced atmospherics and make it off by default again.Graham Linden
2018-09-11Fix cloud shader tex binding to be more robust.Graham Linden
Make vert generation not skip dome verts used for clouds when doing advanced atmospherics.
2018-09-10Put back new func dropped in merge.Graham Linden
2018-09-10Put back extern decl of gSavedSettings dropped in merge.Graham Linden
2018-09-10MergeGraham Linden
2018-09-10Add copies of existing lighting shaders for advanced atmo path.Graham Linden
Enable advanced atmo by default. Disable nSight in settings.xml Remove MSVC debug pragmas.
2018-09-10MAINT-9118: Allow the environment panel to indicated that the environment ↵Rider Linden
may be modified.
2018-09-10Move fname back inside class loop. grumble stringstream grumble.Graham Linden
Fix sky depth-testing with advanced atmospherics.
2018-09-10Pull fname out of class loop so we can see which actual shader file we were ↵Graham Linden
trying to load while debugging.
2018-09-10Fixes for switching between atmospherics implementations on the fly.Graham Linden
2018-09-10MAINT-9115: When selecting no parcel or a parcel without a day cycle, close ↵Rider Linden
the day cycle editor if it is not dirty, if dirty just disable commit.
2018-09-10MergeGraham Linden
2018-09-10First pass at preferences and feature table hookup for advanced atmospherics.Graham Linden
2018-09-10MAINT-9066 EEP should not be able to delete all Keyframes from Ground Level ↵maxim_productengine
or Water
2018-09-10MAINT-9099 Adjustable region altitudes.andreykproductengine
2018-09-07Get rid of (void)this... (this should not have been captured in the first ↵Rider Linden
place.)