summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-11-17Merge fix attempt 3 to avoid crash in gpu_benchmark and get more insightGraham Linden
2014-11-17Attempt wider disable of using profile API when timer query is not presentGraham Linden
2014-11-17Merge avoiding use of timer query ARB extension when not available.Graham Linden
2014-11-17Avoid using GL_ARB_timer_query functionality when not supported and protect ↵Graham Linden
against probably-not-NULL current bound shader pointer
2014-11-16DD-281 : Do not unlist listings that go out of stockMerov Linden
2014-11-16DD-284 : Separate no copy from copy items when counting items in marketplace ↵Merov Linden
listings folders
2014-11-15MAINT-4537 WIP - comments and cleanupBrad Payne (Vir Linden)
2014-11-15MAINT-4537 WIP - more joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14MAINT-4537 WIP - joint position management during outfit changesBrad Payne (Vir Linden)
2014-11-14MAINT-4678: fix crash on launch in gpu benchmarkOz Linden
2014-11-14MAINT-4537 WIP - order of operations during outfit changeBrad Payne (Vir Linden)
2014-11-11Pull merge from lindenlanb/viewer-releaseMerov Linden
2014-11-10DD-266 : Use prevalidateNonNegativeS32 instead of prevalidatePositiveS32... ↵Merov Linden
Grmbl...
2014-11-10DD-276, DD-280 : Serialize update count on SLM by preventing sending update ↵Merov Linden
while previous transaction not completed
2014-11-11Merge changes for 3.7.20-releasemaksymsproductengine
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-10Added tag 3.7.20-release for changeset 27094824773bOz 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-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-28Added tag 3.7.19-release for changeset 82973b38a6c9Oz 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