Commit Graph

39087 Commits (cd5f7b2c03e87cc5d236eaa5b8c025530571376a)

Author SHA1 Message Date
Rider Linden cd5f7b2c03 MAINT-7703: Estate and region flags for parcel environmests (not written to DB yet) 2018-08-06 15:37:09 -07:00
andreykproductengine 21c6e6063f MAINT-8952 EEP Changing one Day Cycle Keyframe can change other keyframes 2018-08-06 16:22:06 +03:00
Rider Linden 057d115ac3 LLStoreAssetCallback now a std::function 2018-08-04 13:05:39 -07:00
Rider Linden 76206db45e remove some pragmas that snuck in 2018-08-03 22:21:43 -07:00
Rider Linden 7e8c849a15 Fix name change from clearTrack to clealCycleTrack 2018-08-03 16:57:04 -07:00
Rider Linden 3f6cedbbf3 Synch settings with simulator. 2018-08-03 16:32:31 -07:00
Rider Linden 56c773b3bc Merge 2018-08-03 16:19:47 -07:00
Rider Linden 8779b29487 Merge 2018-08-03 16:14:01 -07:00
Rider Linden b50d546d5f MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
Nat Goodspeed 09f97172bb MAINT-8176: Add canonical_repo field to viewer's autobuild.xml. 2018-08-02 16:08:53 -04:00
Nat Goodspeed 31afdea8a2 increment viewer version to 5.1.8 2018-08-02 16:02:58 -04:00
Nat Goodspeed ac2b54ae21 Added tag 5.1.7-release for changeset ac3b1332ad4f 2018-08-02 16:02:58 -04:00
andreykproductengine a1fdb88299 MAINT-8945 EEP clicking near a keyframe may activate it without highlighting it green 2018-08-02 19:58:05 +03:00
andreykproductengine a59170df0e MAINT-8905 EEP - tracks should show altitudes 2018-08-01 20:27:47 +03:00
Rider Linden dbbb89a13c Merge 2018-07-30 15:55:33 -07:00
Rider Linden d6ede8e81c MAINT-8904: Creating new setting in inventory now causes simulator to assign default asset ID to inventory item. 2018-07-30 15:54:36 -07:00
andreykproductengine d7ae8a0d28 MAINT-8344 EEP Make arrows white 2018-07-30 20:08:58 +03:00
andreykproductengine dfe3757236 MAINT-8879 EEP Make image swatches square 2018-07-30 18:38:59 +03:00
andreykproductengine c24cbff2ab MAINT-8830 EEP rename "Default Environment" option in About Land > Environment 2018-07-30 18:04:35 +03:00
Rider Linden bc82509ccd fix init on array 2018-07-27 12:20:05 -07:00
Rider Linden ed8082a94b Pausing the clouds will now also stop the waves. 2018-07-27 10:46:32 -07:00
Rider Linden 04ddc58714 'override' key word is all or nothing. Add override to method in editor class 2018-07-26 09:51:18 -04:00
Rider Linden b50faa9b6f Merged in andreykproductengine/maint-eep (pull request #31)
MAINT-8886 EEP - Implement code for load button in fixed environment floater

Approved-by: Simon Linden <simon@lindenlab.com>
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
2018-07-25 17:39:45 +00:00
andreykproductengine 3bbfd3c676 MAINT-8886 EEP - Implement code for load button in fixed environment floater 2018-07-25 18:46:26 +03:00
andreykproductengine c822d8af16 MAINT-8344 implement slider support for an overlap threshold and reenable shift-copy 2018-07-20 19:10:22 +03:00
Rider Linden bb836fcdec Should have been an empty capture for noop lambdas. 2018-07-19 13:40:47 -07:00
Rider Linden 881dc7f3ae Merged in graham_linden/viewer-eep-graham (pull request #29)
MAINT-8876
2018-07-19 20:35:00 +00:00
Graham Linden e3ef729477 Remove optimization of building skybox as possible source of MAINT-8864 2018-07-19 21:32:35 +01:00
Graham Linden 31aa86b703 Compile fixes for latest Xcode on OSX. 2018-07-19 21:11:23 +01:00
Graham Linden 5b874db7c0 Modify deferred sun disc and moon shaders to write all deferrred gbuffer channels
and fix rendering issue from norm/spec channels during lighting.
2018-07-19 20:46:37 +01:00
andreykproductengine 80f98daed9 MAINT-8842 Should not be able to add Environment Setting Assets to Group Notices on a Non-EEP region 2018-07-19 22:27:49 +03:00
andreykproductengine affb75666c MAINT-8906 EEP - Disable sky layer tabs when not supported 2018-07-19 19:23:04 +03:00
andreykproductengine 9248ca8115 SL-920 Disable friendship caps untill new requirements are provided 2018-07-18 16:16:43 +03:00
AndreyL ProductEngine 1abea33b70 MAINT-8334 EEP UI control: Virtual Trackball 2018-07-18 14:13:29 +03:00
andreykproductengine 59d00f986e SL-920 Better logging and limited cap to offline messages 2018-07-17 10:42:17 +03:00
Rider Linden 9391744164 Add default and wellknown asset ids. 2018-07-16 16:49:49 -07:00
andreykproductengine fb3dba5a6e MAINT-8865 Fixed Day Cycle keyframe cannot be deleted 2018-07-12 18:39:35 +03:00
Rider Linden ca5d5be4fb Minor change from the simulator to throttle the minimum blend in a time based blend. 2018-07-11 16:46:14 -07:00
Rider Linden d8ca452163 Merged in graham_linden/viewer-eep-graham (pull request #24)
Fix OSX rendering
2018-07-11 17:30:17 +00:00
Graham Linden c7478f200c Make sun/moon vert shaders use calcAtmospherics in hopes it will get OSX GL to link the shaders without complaining about unwritten varying vars. 2018-07-11 18:03:07 +01:00
Rider Linden 658b2be775 Merged in graham_linden/viewer-eep-graham (pull request #23)
Render fixes and performance improvement for advanced atmo codepath
2018-07-10 23:04:45 +00:00
Graham Linden 5fade93da8 Make moon/star rendering handle transitions between settings w defined textures and settings without better.
Reverse direction of mix to match blend_factor values in stars shader.
2018-07-11 00:01:12 +01:00
Graham Linden ffdd6c3d7d Make advanced atmo sky shader compile again.
Make atmospheric model avoid redundant work when settings don't change.

Point autobuild.xml at libatmosphere with op== to compare density profiles.
2018-07-10 23:26:35 +01:00
Rider Linden 7724ace152 Merge 2018-07-10 15:16:50 -07:00
Rider Linden 294793b9a9 MAINT-8821: Tighten up floater. Allow apply from gear menu. 2018-07-10 15:15:47 -07:00
Rider Linden 9da2480891 Merged in graham_linden/viewer-eep-graham (pull request #22)
Support blending current/next bloom textures in deferred star rendering.
2018-07-10 20:30:44 +00:00
Graham Linden a90e61b798 Support blending current/next bloom textures in deferred star rendering. 2018-07-10 19:08:14 +01:00
Rider Linden b83c028c00 Merged in graham_linden/viewer-eep-graham (pull request #21)
Fix star rendering issues in ALM.
2018-07-10 17:25:35 +00:00
Graham Linden 4fde1adbcf Fix star rendering issues in ALM. 2018-07-10 18:23:02 +01:00
Rider Linden e7ed4b4584 Merged in graham_linden/viewer-eep-graham (pull request #19)
Fix mat stack overflow and broken snapshots in ALM.

Approved-by: Rider Linden <rider@lindenlab.com>
2018-07-10 16:40:38 +00:00