summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Expand)Author
2012-06-09merge changes for DRTVWR-165Oz Linden
2012-06-08Pull and merge a single changeset from http://hg.lindenlab.com/nat/viewer-mai...Todd Stinson
2012-06-08EXP-1953: Ensuring to send the IM_LURE_DECLINED message back to the inviter.Todd Stinson
2012-06-08EXP-1953: Sending an automated IM back to the user who offered the teleport l...Todd Stinson
2012-06-08EXP-1953: First pass at implementing the maturity flow during a teleport via ...Todd Stinson
2012-06-08CHUI-137 : Fix build error after mergeMerov Linden
2012-06-08Merge pull from richard/viewer-chuiMerov Linden
2012-06-08CHUI-137 : Implement conversation list, temporary solution: add but doesn't t...Merov Linden
2012-06-08SH-3153 FIXBrad Payne (Vir Linden)
2012-06-08merge changes to fix http testsOz Linden
2012-06-08MAINT-646 Optimize LLVolumeImplFlexible::doIdleUpdate()Dave Parks
2012-06-08MAINT-646 Enable /fp:fast in Visual StudioDave Parks
2012-06-08MAINT-646 Knock out some extraneous performance timersDave Parks
2012-06-08Merge pull from richard/viewer-chuiMerov Linden
2012-06-08Fix post merge build issue: take clipboard changes into accountMerov Linden
2012-06-08CHUI-137 : Fix crasher in item drawingMerov Linden
2012-06-08Merge pull from richard/viewer-chuiMerov Linden
2012-06-08CHUI-103 FIXED Added a square brackets to system messages; changed a default ...AlexanderP ProductEngine
2012-06-08merge changes for DRTVWR-164Oz Linden
2012-06-08merge changes for DRTVWR-162Oz Linden
2012-06-08merge changes for DRTVWR-163Oz Linden
2012-06-07Pull test fixes from : nat/viewer-llhttpclient-tests/Merov Linden
2012-06-07Merge : pull from lindenlab/viewer-releaseMerov Linden
2012-06-08CHUI-122 FIX Add button enabled only for P2P and ad hoc IM sessions.Seth ProductEngine
2012-06-08CHUI-120 WIP Added conversations participants drag and drop from avatar lists...Seth ProductEngine
2012-06-08CHUI-120 WIP Added avatar picker that allows to add other users to an existin...Seth ProductEngine
2012-06-07PATH-696: Removing an assert as it is no longer always true.Todd Stinson
2012-06-07fix line endings (no code change)Oz Linden
2012-06-07merge changes for DRTVWR-162Oz Linden
2012-06-07mergeBrad Payne (Vir Linden)
2012-06-07mergeprep
2012-06-07Physics capsules now inherit the rotations of their parent vo when rendered. ...prep
2012-06-07MAINT-1144: Merge llhttpclient_test.cpp fix back to tipNat Goodspeed
2012-06-07MAINT-1144: Try to fix Windows build error in llhttpclient_test.cpp.Nat Goodspeed
2012-06-06Automated merge with file:///Users/nat/linden/viewer-maint-1144Nat Goodspeed
2012-06-06MAINT-1144: Re-enable skipped LLHTTPClient tests with local server.Nat Goodspeed
2012-06-06CHUI-137 : Implement temporary conversations list (not working yet)Merov Linden
2012-06-06Performing a test regarding the recent failures of our LLHTTPClient::get serv...Todd Stinson
2012-06-06MAINT-1144: Break out llhttpclient_tut as standalone integration test.Nat Goodspeed
2012-06-06Pull and merge a single changeset from http://hg.lindenlab.com/nat/viewer-mai...Todd Stinson
2012-06-06Pull and merge a single changeset from http://hg.lindenlab.com/nat/viewer-mai...Todd Stinson
2012-06-06MAINT-1144: Unblock build for previous commit.Nat Goodspeed
2012-06-06MAINT-646 Vectorize LLPolyMeshDave Parks
2012-06-06MAINT-646 Don't spend so much time fetching avatar physics params.Dave Parks
2012-06-06MAINT-1147 Don't rebuild volume meshes on region crossing.Dave Parks
2012-06-07CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P chat...Seth ProductEngine
2012-06-06merge changes for DRTVWR-161Oz Linden
2012-06-06MAINT-1144: Defend against NULL LLPluginProcessParent::mProcess.Nat Goodspeed
2012-06-06SH-2789 FIX - windows debug heap off by defaultBrad Payne (Vir Linden)
2012-06-06Render fix to remove blend artifacts on physics capsule. llphysics extension ...prep