summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-07-25MAINT-6460 Crash calculating mesh complexityandreykproductengine
2016-07-14merge changes for STORM-2133Oz Linden
2016-07-14MAINT-6460 Crash calculating mesh complexityandreykproductengine
2016-07-14STORM-2133: VOICE-36 prevents proper shutdown of connectorAnsariel
2016-07-12MAINT-6460 Crash calculating mesh complexityandreykproductengine
2016-07-12MergeRider Linden
2016-07-12STORM-2132: Remove obsoleted unique_ptr.hpp, use make_shared for pointer ↵Rider Linden
allocation.
2016-07-11MAINT-6565: Grab a shared pointer and encapsulate it into the bind call in ↵Rider Linden
place of this. Ensures that the impl is not deleted while the coroutine is active.
2016-07-11MAINT-6534 Resetting scripts via the build menu no longer works on many ↵andreykproductengine
scripted objects
2016-07-08MAINT-6448 PERMISSION_DEBIT notification should default to Denyandreykproductengine
2016-07-08MAINT-6534 Fixed the LLSD validation failureAndreyL ProductEngine
2016-07-07Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-07-06increment viewer version to 4.0.7Oz Linden
2016-06-02MAINT-6448 PERMISSION_DEBIT notification should default to Denyandreykproductengine
2016-06-30MAINT-6534 Resetting scripts fails due to small timeoutandreykproductengine
2016-06-16MAINT-6511 Added a null check in LLFloaterView::restoreAllAndreyL ProductEngine
2016-06-15MAINT-6486: Use literal string. Don't try and look it up.Rider Linden
2016-06-15MAINT-6460 additional header checkandreykproductengine
2016-06-13Merged in rider_linden/viewer-lynx (pull request #26)Andrey Lihatskiy
2016-06-13Merge MAINT-6486Rider Linden
2016-06-10Make string ref in HandleScriptUserData constRider Linden
2016-06-10MAINT-6486: Be sure that all the script queue functions hit all objects and ↵Rider Linden
scripts in those objects. Convert from responders and callbacks to coroutines.
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-31MAINT-2129 One more Block buttonandreykproductengine
2016-05-27MAINT-6435 Deafult preset should set the same settings as the "Reset to ↵AndreyL ProductEngine
recommended settings" button
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-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.