827553f314
ACME-726: Display 'You are connected to Facebook as' text and the user's account name
2013-07-22 15:49:26 -07:00
dcee5fe14f
NORSPEC-320 fix fullbright alpha breakage when not underwater
2013-07-22 15:00:35 -07:00
77a9ac05f4
Turn off logging.
2013-07-22 14:04:34 -07:00
721a2ac06a
MAINT-2717 FIX Cannot see kittycorner SLS region from Sunshine region
2013-07-22 21:32:22 +03:00
6f62251a3d
MATBUG-306 fix alpha knock-on from underwater lightcurve matching
2013-07-22 10:29:49 -07:00
710b529372
NORSPEC-311 NORSPEC-312 make mac happy with shader ifdefs for haze/masking
2013-07-21 16:29:05 -07:00
b8e23afe81
NORSPEC-311 NORSPEC-312 remove unused shader and correct default for display gamma exposed in settings
2013-07-21 14:33:25 -07:00
caefe0e74c
NORSPEC-311 fix alpha / opaque lighting diffs
2013-07-21 14:28:54 -07:00
f44d24fafb
ACME-734 : Fix : Factorize and clean up web browsing address, log and history code
2013-07-21 13:02:55 -07:00
94abe75dea
NORSPEC-315 NORSPEC-316 NORSPEC-312 fix various haze and gamma correction issues, alpha-blend objects still missing haze underwater
2013-07-21 08:15:21 -07:00
eadb42eb9d
ACME-734 : Fix : Feed browsing history but without the query part
2013-07-19 22:35:45 -07:00
39a2f52b02
ACME-734 : Fix forgotten useless call
2013-07-19 19:33:48 -07:00
9b5104b3b5
ACME-734 : Fix : Continue to log but just skip the query parts
2013-07-19 19:32:53 -07:00
ae4c17dee1
Pull merge from lindenlab/viewer-fbc
2013-07-19 17:55:44 -07:00
652ec2feee
ACME-734 : Suppress the green https experiment, prevent logging urls when skipping history, allow temporary url for display purposes
2013-07-19 17:47:58 -07:00
c3c61018cd
ACME-732 Create the viewer side info route responder
2013-07-19 16:36:55 -07:00
53471d762d
MAINT-2908 : Add RegionAboutToShutdown alert to viewer
2013-07-19 13:30:48 -07:00
486a65e68a
Automated merge with http://bitbucket.org/lindenlab/viewer-bear
2013-07-19 13:36:46 -05:00
16709a9bef
ACME-734 : WIP : Implemented changes for https URL in the address bar and added options to web floater to hide history and disable buttons
2013-07-18 21:05:41 -07:00
519cc4f93d
Slight adjustment to RegionRestartSeconds and RegionRestartMinutes messages to
...
show region names.
2013-07-18 18:10:13 -07:00
03563fcaa1
ACME-728: When the 'Disconnect' button is clicked the fbc-service disconnect route should be called
2013-07-18 16:23:11 -07:00
b2e2282e98
ACME-727 Display 'Not connected to Facebook' when the user does not have a FB token
2013-07-18 16:13:14 -07:00
6c186b0c41
Merge vwr-dev-mat
2013-07-18 06:44:28 -07:00
8712086a4b
NORSPEC-314 work-around mystery mac GeForce crash from new shader for nspec 295
2013-07-18 06:37:22 -07:00
883fca9d5a
merge
2013-07-17 17:51:10 -07:00
095c53fa06
ACME-731 Create the llsocialaccountpanel class to handle input/feedback.
2013-07-17 17:50:54 -07:00
0160491f88
NORSPEC-291 put back conversion to srgb in deferred water shader
2013-07-17 10:29:02 -07:00
fd14c250b8
CHOP-962: Preserve unrecognized user settings variables.
...
Change LLControlVariable::mPersist from bool to tri-state enum. Its 'true'
value used to mean "persist only if changed from default;" third state now
means "persist regardless of value." Add forcePersist() method to set that.
Replace isSaveValueDefault() method -- used only by logic to determine whether
to save the variable -- with shouldSave() method to encapsulate ALL that logic
rather than only part of it. shouldSave() recognizes PERSIST_ALWAYS state.
When loading an unrecognized control variable from a user settings file, use
forcePersist() to ensure that we later save that variable again.
Tweak one of the unit tests to adjust for new semantics.
2013-07-17 11:30:09 -04:00
9aeb3b48d7
NORSPEC-291 fix materials underwater, disable attempt at materials in reflect/distort RTs
2013-07-17 08:03:09 -07:00
2b3c1bd40d
CHOP-962: Make LLControlGroup::declare* return LLControlVariable*
...
LLControlGroup::declareControl(), declareString() etc. etc. all used to return
BOOL -- which no one ever examines because it unconditionally returned TRUE.
Make it return the (possibly new) LLControlVariable* instead.
2013-07-17 08:23:42 -04:00
3d6a98d845
created floater_fbc_web for ACME-734 and ACME-735
2013-07-17 02:59:40 +01:00
a4966a6612
OPEN-182: correct tip rev number use in local build version generation
2013-07-16 17:38:26 -04:00
fdea8c66de
switched FB auth to in-viewer browser for ACME-733
2013-07-16 22:15:14 +01:00
611c31a801
CHOP-966: use 4 part version numbers for release notes urls
2013-07-16 17:11:31 -04:00
725288e93a
add contributions for Materials
2013-07-16 15:53:37 -04:00
1587999b03
Add info to vert buffer warnings to track down fullbright alpha mask crasher
2013-07-16 12:03:42 -07:00
cfd17448be
CHOP-960: Validate cmd_line.xml for map-to real settings.xml vars.
...
A small, fixed set of cmd_line.xml switches can't reasonably be mapped to
settings variables, mostly because they affect the settings machinery itself.
Other than those, every new cmd_line.xml switch should map-to a settings
variable. Validate that only the known set does not have map-to; validate that
map-to variable actually exists.
2013-07-16 14:17:00 -04:00
1bdf5ae871
MAINT-2386 Update group information before sending invite
2013-07-16 21:09:53 +03:00
f618b7d5cc
NORSPEC-293 WIP fix fullbrightF order of ops to match non-deferred with fullbright+glow+texcolor
2013-07-16 10:25:06 -07:00
cf33a9a7b3
merge changes for storm-1951
2013-07-16 11:50:03 -04:00
f0f30c976b
NORSPEC-240 revert part of change causing regression in non-ALM rendering
2013-07-16 06:26:02 -07:00
d76e6e2337
NORSPEC-240 make alpha-masked fullbright objs use fullbright alpha mask rendering
2013-07-16 06:10:05 -07:00
749eef31fa
NORSPEC-265 WIP imposters work in non-deferred and ALM but are forward-only render
2013-07-15 17:38:38 -07:00
9988e4739f
ACME-725 Add the connected text, 'Connect...' button, 'User another account...' button and 'Disconnect' button
2013-07-15 17:16:09 -07:00
2c5b265e39
MAINT-2849 FIX Certain streams that play with FMod do not play with FModEx
2013-07-15 16:31:32 -07:00
61e5164a41
ACME-680 Create the Account tab
2013-07-15 16:06:34 -07:00
2be8585baa
merge changes for DRTVWR-325
2013-07-15 16:55:27 -04:00
a540ae81c4
NORSPEC-291 first attempt at gamma correction of materials in reflections
2013-07-15 13:46:01 -07:00
8a3753b7be
Pull merge from lindenlab/viewer-release
2013-07-15 13:29:10 -07:00
2192a024ac
merge changes for CHOP-963
2013-07-15 16:27:22 -04:00
Gilbert Gonzales