d2386652f8
CHOP-962: Make LLControlVariable::setPersist() accept only enum.
...
Initial change made LLControlVariable::mPersist an enum, but retained
bool/BOOL public API. setPersist(true) set one value, setPersist(false) set
another, forcePersist() set the third. Per code review, expose enum to public,
make setPersist() (and LLControlVariable constructor, and LLControlGroup::
declareControl(), and all the LLControlGroup::declareMumble() methods, and all
the unit-test dummy declareMumble() method bodies) accept that enum. Remove
forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly.
Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25 16:46:51 -04:00
7530e801f4
Kill all the vivox logs
2013-07-25 13:42:36 -07:00
24db277777
Restore VITA LLNotiication API
2013-07-25 16:11:26 -04:00
ee0b66f080
VITA test framework - record events support
2013-07-25 16:07:16 -04:00
3045dd6c51
Make use of vertex_color selectable per shader with alphaF/alphaV again
2013-07-25 12:13:21 -07:00
6d21cd2ae1
NORSPEC-324 set gamma value for avatar alpha shader too for gamma correct eyelashes
2013-07-25 11:09:45 -07:00
1015adf322
MAINT-2715 FIX Capabilities request handling not working properly if request gets lost
2013-07-25 19:37:15 +03:00
2d3d04e72f
Merge downstream code
2013-07-30 15:32:39 -07:00
f357269c38
NORSPEC-325 WIP restore gamma (uncorrected) attenuation and unify sRGB conversion in one place
2013-07-25 09:36:13 -07:00
24cef8d36b
NORSPEC-326 eliminate identity theft causing mac nV mobile shader compilation fail
2013-07-24 17:43:56 -07:00
81505ed0a2
merge
2013-07-24 17:17:43 -07:00
91c8740c35
ACME-602 Remove logging code that reveals use of suggested friends
2013-07-24 17:17:19 -07:00
e21ab706b9
NORSPEC-324 when using display_gamma, actually set display_gamma
2013-07-24 15:43:38 -07:00
10c8fbbedb
added default sourceid and check that sourceid is not blank, hoping to get the windows builds to recognize the value
2013-07-24 14:38:23 -07:00
e681d19ea6
MATBUG-306 regression fix, vert color applied in wrong colorspace
2013-07-24 12:17:39 -07:00
9f393c1d99
merge up to latest snowstorm integration branch
2013-07-24 14:40:23 -04:00
f81e2ce680
credit Cinder with STORM-1951
2013-07-24 14:28:30 -04:00
d6b4124fb9
NORSPEC-311 WIP move to per-pixel alpha lighting and make spot/point calcs match more closely
2013-07-24 11:21:40 -07:00
4faad350c7
Improve envelope notification behavior when there is no toast to display
2013-07-24 12:34:32 -04:00
7e2c4cd91d
NORSPEC-314 fix discrepancies between alpha and non-alpha deferred point/spot atten
2013-07-24 08:26:28 -07:00
4854444e24
MATBUG-315 remove unused uniforms from depth downsample frag shaders as they anger some shader compilers despite not being used
2013-07-24 06:11:22 -07:00
e290dd3fa1
NORSPEC-311 make post deferred (alpha objects) respect same gamma ramp as deferred (opaque objects)
2013-07-24 04:03:27 -07:00
4035f23681
Pull merge from lindenlab/viewer-fbc
2013-07-23 17:18:14 -07:00
05c2e08715
ACME-734 : MoaP : Move the secure lock icon to the left on Media on Prim address bar
2013-07-23 17:12:53 -07:00
66d41f02ba
changing facebook floater title to match spec. The title was 'FACEBOOK' and is now 'POST TO FACEOOK'
2013-07-23 16:30:24 -07:00
72a0ae58e9
NORSPEC-293 fix sRGB to linear conversion to not scrooge the darks
2013-07-23 16:09:58 -07:00
6df15cb090
ACME-734 : Fix issues with the lock icon when editing the address bar. Generalize the secure browsing UI.
2013-07-23 15:31:36 -07:00
96869baaef
NORSPEC-285 NORSPEC-298 alpha vs diff color differences
2013-07-23 14:28:52 -07:00
b411179bd0
NORSPEC-314 make work-around apply to all Macs for now
2013-07-23 13:48:57 -07:00
66522bb6bd
ACME-677 Make the 'Connect...', 'Disconnect' and 'Use another account...' buttons disabled upon clicking
2013-07-23 13:31:41 -07:00
18c7ef3276
Fix regression causing fullbright alpha-masked objects to be opaque
2013-07-23 11:36:25 -07:00
d8102b2c5c
NORSPEC-293 hazy glowing fullbright begone
2013-07-23 08:37:35 -07:00
0d663f8d2c
STORM-1958: Only draw the user's netmap dot once
2013-07-23 15:31:00 +00:00
3c336c0f36
Fix for BUG-3363. We have an array of URLs, and we need the paths of those URLs. Explicitly get the path.
2013-07-23 10:56:59 -04:00
6ca0bbe336
Fix for BUG-3364
2013-07-23 10:39:32 -04:00
fa74313e7d
NORSPEC-314 WIP make work-around easier to flip and add 9800M as an evil mac
2013-07-23 04:52:59 -07:00
9da176181a
CHUI-986 FIXED Don't open Conversation floater for offline IMs if it's not from group or friend.
2013-07-23 14:02:50 +03:00
920ca152c6
NORSPEC-314 WIP see if this ruse gets past the decrepit GeForce driver
2013-07-22 20:48:24 -07:00
39bd14f3ca
Automated merge with http://hg.secondlife.com/viewer-release
2013-07-22 22:24:32 -04:00
e121f3f409
CHOP-962: tag before merging in viewer-release
2013-07-22 22:23:24 -04:00
af90459aa9
Removed tag CHOP-962-a
2013-07-22 22:23:16 -04:00
09bbd60104
CHOP-962: tag before merging in viewer-release
2013-07-22 22:22:37 -04:00
35bc91fc5d
CHOP-962: Emit unrecognized-var log message only for Global settings.
...
LLControlGroup::loadFromFile() can of course detect which LLControlGroup
instance it's loading. We only want to log unrecognized settings variables in
LLControlGroup "Global". Settings for "Don't show me this again" notifications
are in group "Warnings".
2013-07-22 22:06:48 -04:00
fdb8c2fcdb
merge
2013-07-22 18:49:39 -07:00
882b2508db
ACME-729 Implement the 'Use another account...' button
2013-07-22 18:49:22 -07:00
9c97f4f5ef
ACME-734 : Fix: Do not log empty URLs, refocus on page if the focus was there
2013-07-22 18:47:05 -07:00
2e266ac409
Pull merge from lindenlab/viewer-fbc
2013-07-22 17:29:48 -07:00
58d107130b
ACME-741: Fixed: Do not try to get FB account info when the user is not connected to FB (otherwise, it autoconnects...)
2013-07-22 17:25:21 -07:00
3c1b6d6dc0
NORSPEC-285 NORSPEC-311 fix gamma correction of diffuse-only objects not matching the rest of the sRGB herd
2013-07-22 16:47:58 -07:00
ccedada681
merge
2013-07-22 15:49:42 -07:00
Nat Goodspeed