summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2016-05-06Automatic merge with headcallum_linden
2016-05-06Merge with https://bitbucket.org/oz_linden/maint-5974 to pick up a variety ↵callum_linden
of fixes
2016-05-06Merge with viewer-releasecallum_linden
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
2016-05-05various changes required to compile on new clangOz Linden
2016-04-26DRTVWR-418: Match KDU_X86_INTRINSICS macro set for KDU package build.Nat Goodspeed
2016-04-26MergeRider Linden
2016-04-26MAINT-6336: Initialize TempBoundListener with constructorRider Linden
2016-04-26DRTVWR-418: add preprocessor define to fix linker error introduced in v7.8callum_linden
2016-04-26MAINT-6336: Put the timeout upstream of the suspending pump and fire the ↵Rider Linden
timeout it. Also some cleanup on LLSD construction in vivox.
2016-04-25Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2016-04-25DRTVWR-418: Fix indra/llkdu wrapper for changes in KDU 7.8 API.Nat Goodspeed
KDU 7.8 introduces a number of changes to its API, most notably by moving public symbols into a variety of kdu_something namespaces. While this is laudable in a general sense, it does require quite a bit of diagnostic building and patching to update legacy code. Since llimagej2ckdu_test.cpp lamentably stubs out pretty much the entire KDU API, we must also fix those stubs for signature changes even to functions we don't otherwise reference. NOTE: This commit still leaves four symbols undefined. Below I have taken the liberty of juxtaposing the error line with the output from dumpbin /exports build-vc120/packages/lib/release/kdu.lib. I see no differences. unresolved symbol (?kdu_convert_ycc_to_rgb_rev16@kdu_core@@3P6AXPAF00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev16)(short *,short *,short *,int)" ?kdu_convert_ycc_to_rgb_rev16@kdu_core@@3P6AXPAF00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev16)(short *,short *,short *,int)) unresolved symbol (?kdu_convert_ycc_to_rgb_irrev16@kdu_core@@3P6AXPAF00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev16)(short *,short *,short *,int)" ?kdu_convert_ycc_to_rgb_irrev16@kdu_core@@3P6AXPAF00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev16)(short *,short *,short *,int)) unresolved symbol (?kdu_convert_ycc_to_rgb_rev32@kdu_core@@3P6AXPAH00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev32)(int *,int *,int *,int)" ?kdu_convert_ycc_to_rgb_rev32@kdu_core@@3P6AXPAH00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_rev32)(int *,int *,int *,int)) unresolved symbol (?kdu_convert_ycc_to_rgb_irrev32@kdu_core@@3P6AXPAM00H@ZA) "void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev32)(float *,float *,float *,int)" ?kdu_convert_ycc_to_rgb_irrev32@kdu_core@@3P6AXPAM00H@ZA (void (__cdecl* kdu_core::kdu_convert_ycc_to_rgb_irrev32)(float *,float *,float *,int)) 24>C:\Users\Nat\linden\viewer64\build-vc120\newview\RelWithDebInfo\secondlife-bin.exe : fatal error LNK1120: 4 unresolved externals
2016-04-25MergeRider Linden
2016-04-25MAINT-6338: Add methods for getting and setting boolean properties from ↵Rider Linden
gSavedSettings in the HTTPCore. Use those methods to access new key HTTPLogBodyOnError. Dump body of HTTP message to log in case of error if this key is true.
2016-04-22Debug code snuck in.Rider Linden
2016-04-22MergeRider Linden
2016-04-22DRTVWR-418 Remove references to gtk-atk-pango-glib from Windows build since ↵callum_linden
it's not used there
2016-04-22MAINT-6336: Centralize waiting on event pump with a timeout. Shorten the ↵Rider Linden
lifespan of a timeout event pump lifespan to be no longer than necessary. Change all references to the LLEventTimer to instead uses the centralized version.
2016-04-22Merged lindenlab/viewer-bear into defaultAndrey Lihatskiy
2016-04-21DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewercallum_linden
2016-04-21Merged in cinderblocks/storm-2127AndreyL ProductEngine
2016-04-21DRTVWR-418 remove references to some misc files I missedcallum_linden
2016-04-21MAINT-6336: MergeRider Linden
2016-04-21DRTVWR-418 remove references to unused TestApps folder (used to contain ↵callum_linden
media_plugin_test)
2016-04-21DRTVWR-418 remove references (and files) for QuickTimecallum_linden
2016-04-21MAINT-6336: Removed or demoted some of the chatty log messages I was using ↵Rider Linden
to track progress.
2016-04-20STORM-2127 - Fix NSException when assigning values that don't exist in cocoa ↵Cinder
modifier key event.
2016-04-20MAINT-6336: Crasher showing up in voice was a Bound Listener that should ↵Rider Linden
have been a Temp Bound listener.
2016-04-20reset crash dump upload retries and timeoutsOz Linden
2016-04-20MAINT-6322 fix merge error that prevented crash dumps from being located for ↵Oz Linden
upload (and add better logging)
2016-04-19MAINT-6336: more loging for test build.Rider Linden
2016-04-19MAINT-6336: Crasher on disconnect in DDoS.Rider Linden
2016-04-18MAINT-6336: Better retry and timeout logic when logging in to the vivox ↵Rider Linden
server and connecting to a session.
2016-04-14Merged lindenlab/viewer-bear into defaultRider Linden
2016-04-14MergeRider Linden
2016-04-14maint-5711 (fix) profiles and marketplace are asking for a login each sessioncallum_linden
2016-04-13MAINT-6305: Forgot to add the coro name.Rider Linden
2016-04-13MAINT-6305: Serialize the AIS calls by reducing the queue size to 1, move ↵Rider Linden
the bake request out of the AIS queue.
2016-04-13add logging around crash reporting, with minor code cleanupsOz Linden
2016-05-04merge changes for MAINT-5974Oz Linden
2016-04-12MAINT-6305: Just bumping a warning level so I can track for debugging.Rider Linden
2016-04-12Shift of negative is undefined.Rider Linden
2016-04-12Added exponential timeout to retry, protect against attempting to downgrade ↵Rider Linden
the COF version in the bake request.
2016-04-12MAINT-6286 Viewer 4.0.3.312680 ignores settings for Shaders in Graphics ↵ruslantproductengine
Preferences for ATI Radeon HD 3800 Series graphics card
2016-04-07MAINT-6294 FIXED Cursor became invisible after typing in any input field (OS X)Mnikolenko ProductEngine
2016-04-01MAINT-6272 Viewer inventory cache bugandreykproductengine
2016-04-06MAINT-1539 'L$' indicator doesn't disappear when object is not for saleandreykproductengine
2016-04-06MAINT-6304 FIXED Push-to-talk triggered with keyboard doesn't close the micAndreyL ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 08:11:34 +0000