summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-17increment viewer version to 5.1.5Nat Goodspeed
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-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-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-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
2018-05-01Le MergeGraham Linden graham@lindenlab.com
2018-04-30MAINT-8610 Fixed GPU Benchmark appears to be broken - "Failed to allocate ↵AndreyL ProductEngine
buffer during benchmark"
2018-04-27Adding fixed water edit dialog.Rider Linden
2018-04-23MAINT-8574 Fixed Crash in LLVOVolume::markDead()AndreyL ProductEngine
+ null checks in LLVOVolume::setLightTextureID()
2018-04-23FIX INTL-282 minor translation issue, Germaneli
2018-04-19FIX INTL-282 minor translation issueeli
2018-04-18MergeGraham Linden graham@lindenlab.com
2018-04-18Correct EOL for last line of files.Rider Linden
2018-04-17MAINT-8374: Added inventory icons.Rider Linden
2018-04-14MergeGraham Linden graham@lindenlab.com
2018-04-13MergeRider Linden
2018-04-12Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-04-12merge MAINT-8474 changesOz Linden
2018-04-12increment viewer version to 5.1.4Oz Linden
2018-04-06MAINT-8203 Restore legacy name lookupAndrey Kleshchev
2018-04-05FIX INTL-282 translations for Viewer Set50 (drtvwr-450 on repository ↵eli
viewer-lynx)
2018-04-04Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2018-04-04MAINT-8203 Temporary disable capability until 'friend request' server side fixandreykproductengine
2018-04-02Merge Xcode 9.3 hotfixGraham Linden graham@lindenlab.com
2018-04-02MAINT-8203 LLIMInfo crash due to capabilityandreykproductengine