summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-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-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-22Merged lindenlab/viewer-bear into defaultAndrey Lihatskiy
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-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 (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-21SL-315 - disable call stack dumping in release, where we don't have the info ↵Brad Payne (Vir Linden)
anyway.
2016-04-21MAINT-6352 FIXED Editing marketplace listings before inventory has fully ↵andreykproductengine
fetched causes listings to be unlisted.
2016-04-21MAINT-6317 [QuickGraphics-RC] Some rigged mesh attachments render fully on ↵ruslantproductengine
jellybaby avatars when ALM is enabled FIXED - remove global identifier for the black texture - add black texture 2x2x3 localy on apllication startup - add special flag to LLViewerFetchedTexture for protect from removing
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-20SL-371 - increased the limit for StackWalker strings, avoid crashing if mesh ↵Brad Payne (Vir Linden)
has wrong number of mAlternateBindMatrix matrices
2016-04-20MAINT-2129 "Block" button doesn't become disabled in remote object inspector ↵andreykproductengine
after object has been added to block list
2016-04-20reset crash dump upload retries and timeoutsOz Linden
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-20MAINT-6322 fix merge error that prevented crash dumps from being located for ↵Oz Linden
upload (and add better logging)
2016-04-20MAINT-6341 Changing properties of the object in inventory are not saved ↵Mnikolenko Productengine
after transfer it to next owner
2016-04-19Remove references to quicktime from the plain old viewer-release buildcallum_linden
2016-04-19MAINT-6336: more loging for test build.Rider Linden
2016-04-19MAINT-6336: Crasher on disconnect in DDoS.Rider Linden
2016-04-19MAINT-6303 Outfit browser should add columns after window is resizedMnikolenko ProductEngine
2016-04-19SL-372 - handle dae models with multiple skeleton rootsBrad Payne (Vir Linden)
2016-04-18SL-371 - more tracking on partial joint overridesBrad Payne (Vir 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-18MAINT-6316 remove duplicate Marketplace listings menu entryOz Linden