summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-08merge changes to fix http testsOz Linden
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-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-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-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-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-07CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P ↵Seth ProductEngine
chat, after adding more participants. - Added a parameter to LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid of a P2P IM floater which should be used to start a new conference in it. - In LLChicletBar::sessionRemoved() we don't close the IM floater if it is going to be re-used for a new conference.
2012-06-06merge changes for DRTVWR-161Oz Linden
2012-06-06tag merge of DRTVWR-161Oz Linden
2012-06-06MAINT-1144: Defend against NULL LLPluginProcessParent::mProcess.Nat Goodspeed
The change from LLProcessLauncher to LLProcess introduces the possibility of a NULL (default-constructed) LLProcessPtr. Add certain static LLProcess methods accepting LLProcessPtr, forwarding to nonstatic method when non-NULL but doing something reasonable with NULL. Use these methods in LLPLuginProcessParent.
2012-06-05EXP-1942: BUGFIX Ensuring to clear the flag indicating that maturity changed ↵Todd Stinson
during teleport when the maturity level change fails.
2012-06-05CHUI-103 Added square brackets to a messages from Second Life in the plain ↵AlexanderP ProductEngine
text mode; changed the default colors of user's messages
2012-06-05merge changes for storm-1872Oz Linden
2012-06-05merge changes for storm-1870Oz Linden
2012-06-05merge changes for storm-1845Oz Linden
2012-06-05storm-1703: update license statementsOz Linden
2012-06-04merge back 3.3.3-beta1 fixesOz Linden
2012-06-04Added tag 3.3.3-beta1, DRTVWR-144 for changeset f0a174c2adb4Oz Linden
2012-06-04tag merge of DRTVWR-160Oz Linden
2012-06-04merge changes for DRTVWR-157Oz Linden
2012-06-04tag merge of DRTVWR-157Oz Linden
2012-06-04STORM-1845: Move "Show HUD Attachments" to Me menuMartinRJ
2012-06-04STORM-1872 A line break is missing in ..\app_settings\settings.xmlJonathan Yap
2012-06-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-06-04merge dictionary importOz Linden
2012-06-04STORM-276 Dictionary import functionality and floaterKitty Barnett
2012-06-01EXP-1942: Ensuring that the teleport cancel works in the case of restarting ↵Todd Stinson
a teleport. Also, ensuring to pull down the teleport screen if we time out of a maturity request with a pending teleport queued.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 21:20:54 +0000