summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-06-02Merge.Nicky
2016-06-01Point audio MIME types at libVLC media plugin vs CEFcallum_linden
2016-06-01Linux: Use media_plugin_libvlc for media playback.Nicky
2016-06-01Linux: SDL has a dependency on X11 -> Link against it.Nicky
2016-06-01GCC compile fix, array initialization needs proper type.Nicky
2016-06-01GCC compile fix (function returns a pointer, not a bool).Nicky
2016-06-01MAINT-6446 Correct password length handlingandreykproductengine
2016-06-08Merged in andreyl_productengine/viewer-lynx-marchcat (pull request #25)Andrey Lihatskiy
MAINT-6461 Added a null check
2016-06-08MAINT-6461 Added a null checkAndreyL ProductEngine
2016-06-03MAINT-6460 Crash calculating mesh complexityandreykproductengine
2016-05-31Fix windows line endingscallum_linden
2016-05-31Remove local flip (as part of resize) in QuickTime plugin for OSXcallum_linden
2016-05-31MAINT-2129 One more Block buttonandreykproductengine
2016-05-27Some simple tidy up and added a proper URL for video test button in web ↵callum_linden
content floater
2016-05-27MAINT-6435 Deafult preset should set the same settings as the "Reset to ↵AndreyL ProductEngine
recommended settings" button
2016-05-27- Make popup appear on the right screen coordinates (this was broken after ↵Nicky
the flipy switch) - Make sure the popup stays until it is dismissed (no need to hold the mouse button to scroll through eg a listbox) [This needs a CEF change.)
2016-05-26Put back QuickTime plugin code for OS X until a LibVLC version is createdCallum Prentice
2016-05-26Fix typo in platform test for CEF versionCallum Prentice
2016-05-26Put back QuickTime plugin code for OS X only (untested - moving code to OS X ↵callum_linden
dev)
2016-05-24MergeRider Linden
2016-05-24MAINT-6403: Updated a couple comments and dropped a couple warning levels ↵Rider Linden
back down to DEBUG.
2016-05-24MAINT-6216 avatars are sometimes invisibleruslantproductengine
BUG-10330 Sitting avatars are sometimes invisible
2016-05-25MAINT-2583 Minimized floaters cannot brought back to foreground anymoreMnikolenko Productengine
2016-05-25MAINT-6413 BuildfixAndreyL ProductEngine
2016-05-25MAINT-6424 Reverted disabling of the "Delete preset" buttonAndreyL ProductEngine
2016-05-25Merged in rider_linden/viewer-lynx (pull request #18)Andrey Lihatskiy
MAINT-6403: Correct the local COF version from AIS when it loses sync.
2016-05-25Merged in lindenlab/viewer-lynx-maint-6413 (pull request #16)Andrey Lihatskiy
2016-05-24merge from maint-6413 into lynx for pull requestGlenn Glazer
2016-05-24MAINT-6413: write summary.json from viewer_manifest.py, remove facility from ↵Glenn Glazer
cmake
2016-05-23Automated merge with tip of viewer-releasecallum_linden
2016-05-23MAINT-6403: in the case of a version mismatch between the viewer's local ↵Rider Linden
accounting and the AIS reported. Override with the AIS version. simplify the appearance update code to account for new versioning. Fix spelling of descendant
2016-05-23debug version argsGlenn Glazer
2016-05-23backout 354346 / e63c00cf654a and 354347 / e4bfe3ee05a6Glenn Glazer
2016-05-23backout 354345Glenn Glazer
2016-05-23Merged in andreyl_productengine/viewer-lion-marchcat (pull request #42)Andrey Lihatskiy
MAINT-6424 Disable the delete button for empty graphics presets list
2016-05-23MAINT-6424 Disable the delete button for empty graphics presets listAndreyL ProductEngine
Fixed related notifications after improper merge as well
2016-05-22MAINT-6432 Fix defaults for RenderAvatarMaxComplexityAnsariel
The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
2016-05-20MAINT-6317 Restored the fix after a conflict resolutionAndreyL ProductEngine
2016-05-20Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-05-20Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-05-19Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-05-19MAIN-6403: If a version mismatch occurs when requesting the COF, request a ↵Rider Linden
new appearance update from the simhost to update the viewer COF version.
2016-05-19increment viewer version to 4.0.6Oz Linden
2016-05-18MAINT-6409 invisiprims should be preloadedandreykproductengine
2016-05-17maint-6413: use configure_file instead of write(file ...)Glenn Glazer
2016-05-17maint-6413: use file write as printf inserts escape charsGlenn Glazer
2016-05-17MAINT-6409 texture_list xml file should be in cache.andreykproductengine
2016-05-18MAINT-6377 Nearby chat toasts cover the conversation floater.Mnikolenko Productengine
2016-05-16fix for maint-6413: add channel to summary.jsonGlenn Glazer
2016-05-16Added support for some transport controls (pause/play/stop) and setting ↵callum_linden
media volume level.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 00:26:43 +0000