summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2014-11-10mergeBrad Payne (Vir Linden)
2014-11-10Merge. Refresh from viewer-release after 3.7.20 released.Monty Brandenberg
2014-11-10merge changes for 3.7.20-releaseOz Linden
2014-11-10increment viewer version to 3.7.21Oz Linden
2014-11-10DD-276 : Let the count on hand be updated locally when updateSLMListing ↵Merov Linden
returns with data from the server
2014-11-08DD-274 : Do not display super long error description (there are in the log ↵Merov Linden
though)
2014-11-08DD-259 : Show only one error when failing on listing, user can see all ↵Merov Linden
errors in Check for Errors
2014-11-08DD-265, DD-266 : Validate the listing id when associating, show alert if ↵Merov Linden
value out of positive integer limit
2014-11-08DD-258 : Disable the Check for Errors buttons (aka Audit) while the ↵Merov Linden
inventory is still fetching
2014-11-08DD-260 : Silence the SLM delete message so to prevent server notification to ↵Merov Linden
show up when deleting or unassociating things from the viewer
2014-11-07DD-272 : Be more consistent when updating the count on hand in SLM, also ↵Merov Linden
prevent multiple folder update when receiving data from SLM
2014-11-06BUG-7698, BUG-7688, BUG-7694 (others) CDN connection issues.Monty Brandenberg
Under pipelining, requests were given a 5x timeout factor due to the way that the timeout clock works in libcurl. Under CDN load, connections were not being torn down quickly and it was only this timer that led to disconnect and retry. So, we want to break a connection that isn't making progress but that isn't immediately possible. We'll compromise with a 60S timeout that (we hope) will be neither too long for stalled connections nor too short for large asset transfer requests.
2014-11-03Merge downstream code and become 3.7.20simon
2014-11-03DD-235 : Use newly built jsoncpp libraries that do include the security fixMerov Linden
2014-11-03mergeBrad Payne (Vir Linden)
2014-11-03DD-263 : Update the count on hand on SLM in various situation where stock ↵Merov Linden
count changes (activate, drag/drop, associate, etc...)
2014-11-03Pull in viewer-release and become version 3.7.20simon
2014-11-03SL-93 WIP - pelvis fixup offsetsBrad Payne (Vir Linden)
2014-10-31settings.xml updateBrad Payne (Vir Linden)
2014-10-30SL-93 WIP - missing includeBrad Payne (Vir Linden)
2014-10-30SL-93 - WIP on managing pelvis fixups using new joint offset frameworkBrad Payne (Vir Linden)
2014-10-29merge changes for MAINT-4560Oz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28merge changes for 3.7.19-releaseOz Linden
2014-10-28increment viewer version to 3.7.20Oz Linden
2014-10-24DD-243 : Set up callbacks for merchant outbox importer in the postBuildMerov Linden
2014-10-24DD-242 : Added beta invitation message to merchants in the marketplace ↵Merov Linden
listings floater
2014-10-23DD-224, DD-246 : Clean up code when receiving delete notification. Display ↵Merov Linden
DAMA alert when associating listing
2014-10-23merge changes for STORM-2081Oz Linden
2014-10-23STORM-2081 - Guard against null gWindowImplementation when fullscreen ↵Cinder
(crashes OS X Yosemite)
2014-10-21DD-224 : WIP : Add a deleteListing method, call SLM_UPDATE_FOLDER ↵Merov Linden
notification if state is deleted
2014-10-21DD-221 : Pointer testing to avoid potential crashMerov Linden
2014-10-21DD-220 : Avoid testing folders against marketplace root if we are not ↵Merov Linden
filtering against the marketplace
2014-10-21merge changes for 3.7.18-releaseOz Linden
2014-10-21Pull merge from lindenlab/viewer-releaseMerov Linden
2014-10-21merge changes for 3.7.18-releaseOz Linden
2014-10-20Merge downsteam code and become version 3.7.19simon
2014-10-20Merge downsteam viewer-release and become version 3.7.19simon
2014-10-20Merge. Refresh from viewer-release after 3.7.18 release.Monty Brandenberg
2014-10-20increment viewer version to 3.7.19Oz Linden
2014-10-19DD-170 : Set the import callback for Merchant Outbox only when clicking the ↵Merov Linden
import button
2014-10-17SL-93 WIP - refactoring LLPosOverrideMap for reusabilityBrad Payne (Vir Linden)
2014-10-29MAINT-4605 WIP - you can't hide your lion eyesBrad Payne (Vir Linden)
2014-10-29MAINT-4606 WIP - handle removing attachments that contain multiple mesh objectsBrad Payne (Vir Linden)
2014-10-15MAINT-4560: turn on display of group title by defaultOz Linden
2014-10-14DD-170 : Check the Merchant Outbox API and hide the menu item if getting ↵Merov Linden
503. Show SLM always.
2014-10-14STORM-2080: correct fitted mesh rendering on some ATI cardsOz Linden
2014-10-14re-fix STORM-1828 (previous fix lost in merge)Oz Linden
2014-10-14Code style cleanups... mostly fixed indentingOz Linden
2014-10-13merge changes for STORM-2056Oz Linden