summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2018-05-24MAINT-8675: In Darwin-specific CMake, use cp, not cmake -E copy.Nat Goodspeed
cmake -E copy does only one file at a time, and older CMake versions don't handle wildcards. But cmake -E copy is specifically for portability. When the copy operation itself is Darwin-only, we can count on having 'cp' available.
2018-05-23fix tests broken by argument added to LLTrans::getStringOz Linden
2018-05-23MAINT-8675: update expired certs in integration testOz Linden
2018-05-23Removed mSavedEnvironment so the Mac build will be happy.Rider Linden
2018-05-23MAINT-8344 Day Cycle Editor (playing)andreykproductengine
2018-05-23MergeGraham Linden graham@lindenlab.com
2018-05-22Enable save/load/import for day edit.Rider Linden
2018-05-22Remove some obsolete sky funcs.Graham Linden graham@lindenlab.com
Remove Matrix3/4 funcs using LLQuat 4-float init incorrectly (they are redundant to angle/axis versions anyway). Fix up tests referring to removed funcs above.
2018-05-22Merge 5.1.5Graham Linden graham@lindenlab.com
2018-05-22MergeRider Linden
2018-05-22Merge PRRider Linden
2018-05-22Manual blender for use in day editing dialog.Rider Linden
2018-05-22MAINT-8344 Day Cycle Editor (part 4, finalization)andreykproductengine
2018-05-21Make rendering of sun / moon work with both in the sky (test visibility ↵Graham Linden graham@lindenlab.com
independently).
2018-05-21Fix broken integration and unit tests.Graham Linden graham@lindenlab.com
Update KDU stubs in integration test. Work around MAINT-8675 stale cert in llsechandler_basic for now. Update stubs for LLTrans::getString in handful of integration tests.
2018-05-30Merged in oz_linden/maint-8675AndreyL ProductEngine
2018-05-18Remove no longer used var hosing OSX build.Graham Linden graham@lindenlab.com
2018-05-18Remove MSVC debug pragmas and comment out code to dump example grids.xml ↵Graham Linden graham@lindenlab.com
file w/ hard-coded grids.
2018-05-18Make nighttime elev constant _SIN, since it uses a sin value.Graham Linden graham@lindenlab.com
Put that constant in sky settings and eliminate dups. Fix up logic around when to use heavenly bodies (fix broken moon in basic sky). Remove unnecessary clip to horizon. Put in temp code to ena/dis sun/moon based on LLEnvironment::getIsDaytime().
2018-05-18MergeRider Linden
2018-05-18Day cycle editor changes for loading settings. (Not complete)Rider Linden
2018-05-18MAINT-8344 Day Cycle Editor (part 3)andreykproductengine
2018-05-18Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-05-17increment viewer version to 5.1.5Nat Goodspeed
2018-05-18MergeGraham Linden graham@lindenlab.com
2018-05-18Fix Mie Config validation in sky settings.Graham Linden graham@lindenlab.com
Start cleanup of heavenly body rendering.
2018-05-18MergeGraham Linden graham@lindenlab.com
2018-05-17Self contained looping track blender. Will blend over time across an entire ↵Rider Linden
track in a day cycle.
2018-05-17Fix end of cycle trigger for time blender.Rider Linden
2018-05-17MAINT-8344 Prevent multislider from locking in infinit cycleandreykproductengine
2018-05-16Merge and disable new sky render.Graham Linden graham@lindenlab.com
2018-05-16MergeRider Linden
2018-05-16Splitting the blender up to support manual positioning as well as time. Phase1Rider Linden
2018-05-16MAINT-8344 Day cycle editor (part 2)andreykproductengine
2018-05-16MergeGraham Linden graham@lindenlab.com
2018-05-15Fix the blend code to record the amount of the blend and to store what is ↵Rider Linden
being blended towards.
2018-05-15MergeGraham Linden graham@lindenlab.com
2018-05-14Merged in ruslantproductengine/viewer-cougar-4cr-2 (pull request #10)Ruslan Teliuk
MAINT-8348 [LOVE ME RENDER] Edit Rotation Rings Occluded by Mesh Objects Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2018-05-11MergeRider Linden
2018-05-11Remove the old sky and water edit dialogs.Rider Linden
2018-05-11MAINT-8344 Day cycle editor (part 1)andreykproductengine
2018-05-10Settings editor available from the open context on the menu. Can edit ↵Rider Linden
inventory items.
2018-05-10MAINT-8348 [LOVE ME RENDER] Edit Rotation Rings Occluded by Mesh Objectsruslantproductengine
FIXED
2018-05-09MergeGraham Linden graham@lindenlab.com
2018-05-08Add save/update functionality hooks to fixed editor.Rider Linden
2018-05-03Inventory context menus and increment attrib for settings panels.Rider Linden
2018-05-02Fixed sky editing floater.Rider Linden
2018-05-01Mac is not fond at all of unused variables.Rider Linden
2018-04-30Refresh is defined in LLPanel. Must be marked override here alsoRider Linden
2018-04-30New water settings dialog.Rider Linden