summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-07-22mergeGilbert Gonzales
2013-07-22ACME-729 Implement the 'Use another account...' buttonGilbert Gonzales
2013-07-22ACME-734 : Fix: Do not log empty URLs, refocus on page if the focus was thereMerov Linden
2013-07-22Pull merge from lindenlab/viewer-fbcMerov Linden
2013-07-22ACME-741: Fixed: Do not try to get FB account info when the user is not ↵Merov Linden
connected to FB (otherwise, it autoconnects...)
2013-07-22NORSPEC-285 NORSPEC-311 fix gamma correction of diffuse-only objects not ↵Graham Linden
matching the rest of the sRGB herd
2013-07-22mergeGilbert Gonzales
2013-07-22ACME-726: Display 'You are connected to Facebook as' text and the user's ↵Gilbert Gonzales
account name
2013-07-22NORSPEC-320 fix fullbright alpha breakage when not underwaterGraham Linden
2013-07-22Turn off logging.Aura Linden
2013-07-22MAINT-2717 FIX Cannot see kittycorner SLS region from Sunshine regionPavelK ProductEngine
2013-07-22MATBUG-306 fix alpha knock-on from underwater lightcurve matchingGraham Linden
2013-07-21NORSPEC-311 NORSPEC-312 make mac happy with shader ifdefs for haze/maskingGraham Linden
2013-07-21NORSPEC-311 NORSPEC-312 remove unused shader and correct default for display ↵Graham Linden
gamma exposed in settings
2013-07-21NORSPEC-311 fix alpha / opaque lighting diffsGraham Linden
2013-07-21ACME-734 : Fix : Factorize and clean up web browsing address, log and ↵Merov Linden
history code
2013-07-21NORSPEC-315 NORSPEC-316 NORSPEC-312 fix various haze and gamma correction ↵Graham Linden
issues, alpha-blend objects still missing haze underwater
2013-07-19ACME-734 : Fix : Feed browsing history but without the query partMerov Linden
2013-07-19ACME-734 : Fix forgotten useless callMerov Linden
2013-07-19ACME-734 : Fix : Continue to log but just skip the query partsMerov Linden
2013-07-19Pull merge from lindenlab/viewer-fbcMerov Linden
2013-07-19ACME-734 : Suppress the green https experiment, prevent logging urls when ↵Merov Linden
skipping history, allow temporary url for display purposes
2013-07-19ACME-732 Create the viewer side info route responderGilbert Gonzales
2013-07-19MAINT-2908 : Add RegionAboutToShutdown alert to viewersimon
2013-07-19Automated merge with http://bitbucket.org/lindenlab/viewer-bearDave Parks
2013-07-18ACME-734 : WIP : Implemented changes for https URL in the address bar and ↵Merov Linden
added options to web floater to hide history and disable buttons
2013-07-18Slight adjustment to RegionRestartSeconds and RegionRestartMinutes messages tosimon
show region names.
2013-07-18ACME-728: When the 'Disconnect' button is clicked the fbc-service disconnect ↵Gilbert Gonzales
route should be called
2013-07-18ACME-727 Display 'Not connected to Facebook' when the user does not have a ↵Gilbert Gonzales
FB token
2013-07-18Merge vwr-dev-matGraham Linden
2013-07-18NORSPEC-314 work-around mystery mac GeForce crash from new shader for nspec 295Graham Madarasz
2013-07-17mergeGilbert Gonzales
2013-07-17ACME-731 Create the llsocialaccountpanel class to handle input/feedback.Gilbert Gonzales
2013-07-17NORSPEC-291 put back conversion to srgb in deferred water shaderGraham Linden
2013-07-17CHOP-962: Preserve unrecognized user settings variables.Nat Goodspeed
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-17NORSPEC-291 fix materials underwater, disable attempt at materials in ↵Graham Linden
reflect/distort RTs
2013-07-17CHOP-962: Make LLControlGroup::declare* return LLControlVariable*Nat Goodspeed
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-17created floater_fbc_web for ACME-734 and ACME-735Cho
2013-07-16OPEN-182: correct tip rev number use in local build version generationOz Linden
2013-07-16switched FB auth to in-viewer browser for ACME-733Cho
2013-07-16CHOP-966: use 4 part version numbers for release notes urlsOz Linden
2013-07-16add contributions for MaterialsOz Linden
2013-07-16Add info to vert buffer warnings to track down fullbright alpha mask crasherGraham Linden
2013-07-16CHOP-960: Validate cmd_line.xml for map-to real settings.xml vars.Nat Goodspeed
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-16MAINT-2386 Update group information before sending invitemaxim@mnikolenko
2013-07-16NORSPEC-293 WIP fix fullbrightF order of ops to match non-deferred with ↵Graham Linden
fullbright+glow+texcolor
2013-07-16merge changes for storm-1951Oz Linden
2013-07-16NORSPEC-240 revert part of change causing regression in non-ALM renderingGraham Linden
2013-07-16NORSPEC-240 make alpha-masked fullbright objs use fullbright alpha mask ↵Graham Linden
rendering
2013-07-15NORSPEC-265 WIP imposters work in non-deferred and ALM but are forward-only ↵Graham Linden
render