summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-25DRTVWR-418: Fix MD5 hashes for KDU 314311 packages.Nat Goodspeed
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-25MAINT-6283 revertedMnikolenko Productengine
2016-04-24Code stylistics.Nicky
(transplanted from 570ea799407270069974021eca3a5056d6908f58)
2016-04-24Fix a crash is drawn vertices is 0.Nicky
(transplanted from 89b3e585218ddb8d6a3e62af29f8daf889371e5e)
2016-04-24Windows z64: Disable warning 4267 via llpreprocessor rather than cmake filesNicky
(transplanted from 165fa5852652a1da005cf3b2201c192f028efd43)
2016-04-23SL-375 - ignore joint position overrides if they are equivalent to the ↵Brad Payne (Vir Linden)
default position.
2016-04-23Merged in lindenlab/viewer-bearAndreyL ProductEngine
2016-04-22Debug code snuck in.Rider Linden
2016-04-22Fasttimers: Windows) Always use the __rdtsc() intrinsic rather than inline ↵Nicky
assembly. Linux/OSX) The rtdsc assembly intruction is clobbering EAX and EDX, the snippet was not protecting EDX accordingly. (transplanted from 6307b134f821390367d4c86a03b9a492ac7ed282)
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-22DRTVWR-418 Update the version of cef-bin via llceflib that we consume (no ↵callum_linden
code changes, just updating to latest after changes to documentation/private status)
2016-04-22fixed hash fix for llphysicsextension_source package.Brad Payne (Vir Linden)
2016-04-22hash fix for llphysicsextension_source package.Brad Payne (Vir Linden)
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-22SL-374 - don't allow sliders to modify joint positions if there's already a ↵Brad Payne (Vir Linden)
mesh-imposed override in place.
2016-04-22spruce up the README (I needed a change to force a new build number)Oz Linden
2016-04-22MAINT-2063 Fixed User had ability to delete Notecards and textures from libraryandreykproductengine
2016-04-22MAINT-6303 Width was changed to appropriate valueMnikolenko ProductEngine
2016-04-22MAINT-6229 Organize Outfit Browser thumbnailsMnikolenko ProductEngine
2016-04-22x64: Do not use a union of LLColor4U. Especially having the two pointer in ↵Nicky
there will blow up the struct to at least 8 byte, which will break VBO packing as this class needs to be 4 byte in size. (transplanted from 847df86d6b5daa69dcfc428df18876a9c1e8bef6)
2016-04-22Windows: 1. GWL_USERDATA must be GWLP_USERDATA to be compatible with x86 and ↵Nicky
x64. (GWL_USERDATA is deprecated anyway). 3. Replace Get/SetWindowLong with Get/SetWindoeLongPtr or placing this into GWLP_USERDATA will truncate the pointer. (transplanted from 5f50745bff03700d3862a6bb1eb5936be0fdc6cd)
2016-04-22Windows: USe the correct datatypes when calling the Windows API.Nicky
(transplanted from 8b0c42b1a4f0416a17c8ec6078a85c5773f69a25)
2016-04-22Add build-vc120_x64/ to the ignore list.Nicky
(transplanted from 98e2f67eded2d68f9a3780e7f6ed1dbf2dc3a0a7)
2016-04-22Windows x64: Cannot use inline assembly.Nicky
(transplanted from 0b621f8a1ee707527325eb70e59ef02c63e2bd10)
2016-04-22Windows x64: 64 bit implies SSE2, handle this accordingly when detecting if ↵Nicky
SSE2 is enabled. (transplanted from 93492b84cb752dc79c74d9667f11edd76ace8f0b)
2016-04-22Windows x64: Cannot use inline assembly.Nicky
(transplanted from ee32840fc591f5529a0b544243e7b4146eb8f531)
2016-04-22Windows x64: Disable warning 4267 (it causes too much noise) and do not ↵Nicky
enable /arch:SSE2 (x64 implies SSE2 and setting the flag causes warnings). (transplanted from 5a7cc3874065b13a83b8c7aa044fb07f38edd283)
2016-04-22Add windows64 config.Nicky
(transplanted from 96ec064688376d0f4bfbabcfe8d478227403b630)
2016-04-21DRTVWR-418 pull in fixed (all headers) version of NVAPIcallum_linden
2016-04-22Merged lindenlab/viewer-bear into defaultAndrey Lihatskiy
2016-04-21DRTVWR-418 downgrade NVAPI package - very newest version was incompatible ↵callum_linden
with viewer code
2016-04-21DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewercallum_linden
2016-04-21SL-371 - removed magic-offset check, for now.Brad Payne (Vir Linden)
2016-04-21SL-314 - show bones now colorizes rigged-to joints a different color. Also ↵Brad Payne (Vir Linden)
removed what I think is some redundancy in calculating attachment pos overrides. If it breaks I'll change it back.
2016-04-21Merged in cinderblocks/storm-2127AndreyL ProductEngine
2016-04-21Merged in Ansariel/391-blizzard-496-merge-cleanup (pull request #29)Oz Linden
Fix further merge error in LLLiveLSLEditor::draw()
2016-04-21Merged ruslantproductengine/ruslanteliuk-391-blizzard/tip into defaultOz Linden
2016-04-21MAINT-6326 [QuickGraphics-RC] Blingposter avatars are all full bright white ↵ruslantproductengine
when basic shaders are disabled.
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 to unused FreeGlut and GLUI packagescallum_linden
2016-04-21DRTVWR-418 remove references to unused Google Perf Tools packagecallum_linden
2016-04-21DRTVWR-418 remove references (and files) for QuickTimecallum_linden
2016-04-21DRTVWR-418 add references to new third party packagescallum_linden
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-19 23:54:23 +0000