summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
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-06merge changes for DRTVWR-161Oz Linden
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 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-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.
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-31fix spell checker floater registrationOz Linden
2012-05-31merge changes for storm-276Oz Linden
2012-05-31MAINT-639 Fix for random rainbow effects on some prims.Dave Parks
2012-05-31STORM-1812 Added teleport started callbackJonathan Yap
2012-05-31STORM-276 Match preferences look to that of the auto-replace functionality ↵Kitty Barnett
in STORM-1738
2012-05-30STORM-1812 First pass at adding teleport started signalJonathan Yap
2012-05-30MAINT-622 Fix for broken alpha masking on avatar clothing when Lighting and ↵Dave Parks
Shadows enabled.
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-30STORM-1812 Add debugging lines and call audio_update to try to work around a ↵Jonathan Yap
possible race condition
2012-05-30Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix ↵Dave Parks
VBO accounting.
2012-05-30merge changes for storm-1860Oz Linden
2012-05-30merge up to 3.3.2-releaseOz Linden
2012-05-30possible fix for storm-1866 (crash when first key in chat is space)Oz 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.
2012-05-29EXP-1942,EXP-1945: Ensuring that the teleport process waits for the maturity ↵Todd Stinson
preferences to be synced between viewer and server.
2012-05-29merge changes for DRTVWR-155Oz Linden
2012-05-29MAINT-775 Fix for regression where rigged attachments get distorted on ↵Dave Parks
region crossing or teleport.
2012-05-26merge latest viewer-releaseOz Linden
2012-05-26storm-1738: fix dumb pre-checkin changeOz Linden
2012-05-26storm-1738: clarify word recognition codeOz Linden
2012-05-25Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
2012-05-25EXP-1942,EXP-1945: More robust handling and syncing of the maturity preference.Todd Stinson
2012-05-25fix problems due to LLSD-30, and implement persistent settingsOz Linden
2012-05-25MAINT-616 Potential fix for corrupted mip maps.Dave Parks
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-25EXP-1942, EXP-1945: Improved handling of the maturity preference change ↵Todd Stinson
response. Still needs work though.
2012-05-25MAINT-616 Faster issuance of occlusion queries.Dave Parks
2012-05-24EXP-1942,EXP-1945: Altering behavior when setting maturity preference to ↵Todd Stinson
check the server response in an effort to ensure the viewer and server remain in sync. This is a partial commit as I still need to add user behavior and notifications when things go wrong.
2012-05-24merge changes for DRTVWR-154Oz Linden
2012-05-24merge changes for DRTVWR-151Oz Linden