summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-09tag merge of DRTVWR-165Oz Linden
2012-06-08Pull and merge a single changeset from ↵Todd Stinson
http://hg.lindenlab.com/nat/viewer-maint-1144/ to resolve build issues.
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 ↵Todd Stinson
lure informing the inviter that the guest cannot access the region because of their maturity level.
2012-06-08EXP-1953: First pass at implementing the maturity flow during a teleport via ↵Todd Stinson
lure.
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 ↵Merov Linden
take out items from the list
2012-06-08merge changes for tags in viewer-beta repoOz 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
color for user messages
2012-06-08merge changes for DRTVWR-164Oz Linden
2012-06-08tag merge of DRTVWR-164Oz Linden
2012-06-08merge changes for DRTVWR-162Oz Linden
2012-06-08tag merge of DRTVWR-162Oz Linden
2012-06-08tag merge of DRTVWR-164Oz Linden
2012-06-08merge changes for DRTVWR-163Oz Linden
2012-06-08tag merge of 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 ↵Seth ProductEngine
lists to IM floaters. - Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER. - Disabled calling card drop support as it is considered obsolete.
2012-06-08CHUI-120 WIP Added avatar picker that allows to add other users to an ↵Seth ProductEngine
existing chat if they don't participate in it already.
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-07tag merge of DRTVWR-162Oz Linden
2012-06-07mergeBrad Payne (Vir Linden)
2012-06-07mergeprep
2012-06-07Update to latest llphysics extensions library.prep
2012-06-07Physics capsules now inherit the rotations of their parent vo when rendered. ↵prep
API update.
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
Over the years we've skipped more and more of the tests in llhttpclient_test.cpp (nee llhttpclient_tut.cpp) because they've relied on particular behaviors from Internet sites not under our control. We skipped a test that fetches llsd+xml from secondlife.com because "secondlife.com is not reliable enough for unit tests." We skipped a test that tries to observe a failure with "http://www.invalid" because some local ISPs turn "no such domain" DNS errors into valid pages offering the requester to buy the specified domain name. Today we've had to skip tests attempting to contact "http://www.google.com" for reasons we haven't yet diagnosed, but that probably have to do with Google's IPv6 rollout. Use local temp server test_llsdmessage_peer.py as the success destination, eliminating DNS, Internet access and remote server behavior as failure modes. Use idle localhost port for failure test. Re-enable all skipped LLHTTPClient tests! Re-enable on Windows! In support of these tests, modify test_llsdmessage_peer.py: Support HEAD as no-data variant of GET. Change GET result dict to avoid resembling an error response -- confusing. Make GET/POST return actual dict rather than undecorated string "success". Because of that last, change llcapabilitylistener_test.cpp and llsdmessage_test.cpp to extract "reply" key from response rather than expecting response to be a string itself.
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 ↵Todd Stinson
services. This changeset should be undone.
2012-06-06MAINT-1144: Break out llhttpclient_tut as standalone integration test.Nat Goodspeed
indra/test/llhttpclient_tut.cpp ==> indra/llmessage/tests/llhttpclient_test.cpp, with corresponding CMakeLists.txt changes in their respective directories. This first commit merely moves the test source file without changing it -- separating out moves from edits simplifies code review.
2012-06-06Pull and merge a single changeset from ↵Todd Stinson
http://hg.lindenlab.com/nat/viewer-maint-1144/ to resolve build issues.
2012-06-06Pull and merge a single changeset from ↵Todd Stinson
http://hg.lindenlab.com/nat/viewer-maint-1144/ to resolve build issues.
2012-06-06MAINT-1144: Unblock build for previous commit.Nat Goodspeed
Today, 2012-06-06, LLHTTPClient::get("http://www.google.com/") has stopped working. This is unrelated to viewer code changes: it crosses repo boundaries. Skip the afflicted tests to get builds working until we can recast the tests to avoid the flaky dependency.
2012-06-06MAINT-646 Vectorize LLPolyMeshDave Parks