Commit Graph

23302 Commits (3ebfcd70542b29bd709fc08860eb06f211e2fa6a)

Author SHA1 Message Date
Oz Linden 3ebfcd7054 merge changes for DRTVWR-163 2012-06-08 09:00:05 -04:00
Oz Linden 4089875154 tag merge of DRTVWR-163 2012-06-08 08:59:31 -04:00
Oz Linden ed15f056b1 fix line endings (no code change) 2012-06-07 14:04:03 -04:00
Oz Linden 680dda8ed2 merge changes for DRTVWR-162 2012-06-07 13:39:42 -04:00
Oz Linden 14335ff562 tag merge of DRTVWR-162 2012-06-07 13:39:23 -04:00
Nat Goodspeed ce563795e1 MAINT-1144: Merge llhttpclient_test.cpp fix back to tip 2012-06-07 05:47:50 -04:00
Nat Goodspeed d167ebe35f MAINT-1144: Try to fix Windows build error in llhttpclient_test.cpp. 2012-06-07 05:46:47 -04:00
Nat Goodspeed 89ea7ccfc7 Automated merge with file:///Users/nat/linden/viewer-maint-1144 2012-06-06 23:21:07 -04:00
Nat Goodspeed 3d1cb7ef11 MAINT-1144: Re-enable skipped LLHTTPClient tests with local server.
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-06 23:12:11 -04:00
Nat Goodspeed cd05a244da MAINT-1144: Break out llhttpclient_tut as standalone integration test.
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-06 19:57:58 -04:00
Nat Goodspeed da6c5fbf7f MAINT-1144: Unblock build for previous commit.
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-06 19:05:51 -04:00
Oz Linden ada746bd2a merge changes for DRTVWR-161 2012-06-06 16:44:55 -04:00
Oz Linden 84d3a5a9cf tag merge of DRTVWR-161 2012-06-06 16:44:22 -04:00
Oz Linden a4452eef27 merge changes for storm-1872 2012-06-05 10:44:02 -04:00
Oz Linden 8276228600 merge changes for storm-1870 2012-06-05 10:43:35 -04:00
Oz Linden c432ee1581 merge changes for storm-1845 2012-06-05 10:43:14 -04:00
Oz Linden 2ad0bc334d storm-1703: update license statements 2012-06-05 10:02:48 -04:00
Oz Linden 0bd84271a9 merge back 3.3.3-beta1 fixes 2012-06-04 21:15:23 -04:00
Oz Linden fd3ae758d0 Added tag 3.3.3-beta1, DRTVWR-144 for changeset f0a174c2adb4 2012-06-04 21:11:54 -04:00
Oz Linden 332523b0d6 tag merge of DRTVWR-160 2012-06-04 21:08:40 -04:00
Oz Linden 13ca132037 merge changes for DRTVWR-157 2012-06-04 17:07:27 -04:00
Oz Linden 503d394fb5 tag merge of DRTVWR-157 2012-06-04 17:07:07 -04:00
MartinRJ f9879b8ea9 STORM-1845: Move "Show HUD Attachments" to Me menu 2012-06-04 17:01:32 -04:00
Jonathan Yap c2f0a8ef02 STORM-1872 A line break is missing in ..\app_settings\settings.xml 2012-06-04 16:23:16 -04:00
Aura Linden 0fd3ff972d MAINT-1142 use VBO pooling on OSX 2012-06-04 12:15:08 -07:00
Jonathan Yap f58cfdac22 STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached 2012-06-01 16:01:40 -04:00
Jonathan Yap 8e6202ad53 STORM-1812 Added teleport started callback 2012-05-31 06:20:12 -04:00
Jonathan Yap 29737cb9c0 STORM-1812 First pass at adding teleport started signal 2012-05-30 17:07:17 -04:00
Oz Linden e2eafb565f merge changes for DRTVWR-159 2012-05-30 16:02:38 -04:00
Oz Linden 66927f4c6a tag merge of DRTVWR-159 2012-05-30 16:02:18 -04:00
Oz Linden 98457f8455 merge changes for storm-1852 2012-05-30 14:27:59 -04:00
Oz Linden 6fa682bb77 merge changes for storm-1858 2012-05-30 14:27:35 -04:00
Oz Linden 04d5a07949 merge changes for storm-1862 2012-05-30 14:26:20 -04:00
Oz Linden c97ddff395 merge changes for storm-1863 2012-05-30 14:24:47 -04:00
Jonathan Yap b2434b2f5e STORM-1812 Add debugging lines and call audio_update to try to work around a possible race condition 2012-05-30 14:23:43 -04:00
Oz Linden dd0c04b864 merge changes for storm-1860 2012-05-30 14:09:35 -04:00
Oz Linden e25dee11ff increment viewer version to 3.3.4 2012-05-29 18:50:43 -04:00
Oz Linden 3361b5e9e2 Added tag DRTVWR-144, 3.3.3-beta1 for changeset 1b7f311b5a5d 2012-05-29 18:09:09 -04:00
Oz Linden 0f6ba6c514 merge changes for DRTVWR-153 2012-05-29 17:50:26 -04:00
Oz Linden a46b820b0c tag merge of DRTVWR-153 2012-05-29 17:50:05 -04:00
Don Kjer 2d3790b239 Merge ssh://hg@bitbucket.org/lindenlab/viewer-release -> viewer-eventapi-fixes 2012-05-29 20:41:10 +00:00
Oz Linden 6ea9848387 merge changes for DRTVWR-155 2012-05-29 14:49:20 -04:00
Oz Linden 380c0eb5ac tag merge of DRTVWR-155 2012-05-29 14:48:55 -04:00
Oz Linden 4cffd32f90 merge back change to force ticket number from viewer-release 2012-05-29 13:31:06 -04:00
Oz Linden 81870e09c9 merge changes for DRTVWR-148 2012-05-29 12:42:53 -04:00
Oz Linden 5db5102fe0 tag merge of DRTVWR-148 2012-05-29 12:42:50 -04:00
Oz Linden a519e34f02 inconsequential change to force new ticket number 2012-05-28 09:23:24 -04:00
Oz Linden dbac37dcb5 merge latest viewer-release 2012-05-26 16:12:33 -04:00
Oz Linden b2baee8e34 merge changes for DRTVWR-156 2012-05-26 06:50:55 -04:00
Oz Linden b8d248f275 tag merge of DRTVWR-156 2012-05-26 06:49:40 -04:00