summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-06-21merge changes for DRTVWR-171Oz Linden
2012-06-14EXP-1953: Updating the response message sent to the Inviter in Scenario 3.Todd Stinson
2012-06-13EXP-1959: Marking the teleport entry access notifications as unique so they ↵Todd Stinson
do not stack.
2012-06-12EXP-1941: Backed out changeset: 2f6546ac7e5eTodd Stinson
2012-06-12EXP-1953: Updating copy after Leo creating the final copy in the jira.Todd Stinson
2012-06-12EXP-1953: Altering the behavior of building an LLTextBase such that icons ↵Todd Stinson
are appended in place rather than prepended out of context.
2012-06-11Correcting an incorrectly named notification.Todd Stinson
2012-06-09merge changes for 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-08SH-3153 FIXBrad Payne (Vir Linden)
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-07fix line endings (no code change)Oz Linden
2012-06-07merge changes for 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-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-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-06merge changes for 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-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-04merge changes for 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-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.
2012-06-01STORM-1870 Avatar tracking beacon doesn't get disabled if ↵Jonathan Yap
DESTINATION_REACHED_RADIUS is reached
2012-06-01EXP-1950: Correcting typo in notification.Todd Stinson
2012-05-31STORM-1812 Added teleport started callbackJonathan Yap
2012-05-30STORM-1812 First pass at adding teleport started signalJonathan Yap
2012-05-30merge changes for storm-1852Oz Linden
2012-05-30merge changes for storm-1858Oz Linden
2012-05-30merge changes for storm-1862Oz Linden
2012-05-30merge changes for storm-1863Oz Linden
2012-05-30STORM-1812 Add debugging lines and call audio_update to try to work around a ↵Jonathan Yap
possible race condition
2012-05-30merge changes for storm-1860Oz Linden
2012-05-29Re-adding a line of code that was unintentionally removed.Todd Stinson
2012-05-29EXP-1950: Breaking out the dialogs into 2 paths so that teleports can report ↵Todd Stinson
messages with slightly different wordings.
2012-05-29EXP-1942,EXP-1945: Pulling down the teleport screen in the scenario of ↵Todd Stinson
waiting for a maturity preference change that is still being posted to the server.