summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2016-05-25pull from lynxGlenn Glazer
2016-05-25Backed out changeset 9adcab4d611bGlenn Glazer
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-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-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-23debug print statement to be removed laterGlenn Glazer
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-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-16MAINT-5935 server timestampandreykproductengine
2016-05-13MAINT-6383 SLT timestamp in "About second life" floaterandreykproductengine
2016-05-13MAINT-6408 FIXED viewer should allow password field entry greater than 16 bytesMnikolenko Productengine
2016-05-13MAINT-6400 Make the region "Object Bonus" setting saferMnikolenko Productengine
2016-05-11MAINT-5635 PSYS_SRC_MAX_AGE breaks when replacing a particle system without itandreykproductengine
2016-05-11mergeGlenn Glazer
2016-05-10mergeGlenn Glazer
2016-05-10Merged in MAINT-6370Andrey Kleshchev
2016-05-10Display correct attempt for requesting region capabilities at startupAnsariel
2016-05-18MAINT-2129 "Block" button doesn't become disabledandreykproductengine
2016-05-20MAINT-1057 Allow to close build floater via Build menuMnikolenko Productengine
2016-05-10merge changes for MAINT-6392Oz Linden
2016-05-09MAINT-6392: Do not change the URL used for getting cookies (except to pass ↵Rider Linden
it to CEF) The original URL is used for HTTP Core access to profile functionality.
2016-05-06Merged in lindenlab/viewer-lynxAndreyL ProductEngine
2016-05-06Merged in oz_linden/maint-5974AndreyL ProductEngine
2016-05-06Merged in andreyl_productengine/viewer-lion-marchcat (pull request #37)Andrey Lihatskiy
MAINT-6376 Disable loading surface textures in the wireframe mode
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-05-06Merged in lindenlab/viewer-bearAndreyL ProductEngine
2016-05-06fix cmake warning by conditionalizing dependency that does not exist on MacsOz Linden
2016-05-06merge changes for 4.0.4-releaseOz Linden
2016-05-06increment viewer version to 4.0.5Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 16:14:43 +0000