summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2012-06-28merge up to 3.3.3-releaseOz Linden
2012-06-21merge changes for storm-1871Oz Linden
2012-06-19merge changes for open-142Oz Linden
2012-06-18merge changes for storm-1878Oz Linden
2012-06-18merge changes for storm-1868Oz Linden
2012-06-18merge changes for storm-1844Oz Linden
2012-06-18merge changes for storm-1877Oz Linden
2012-06-18merge changes for storm-1843Oz Linden
2012-06-18STORM-1844: Block and Ignore buttons on llDialog() menus overlap when there ↵MartinRJ Fayray
is only one button
2012-06-13MergeGeenz
2012-06-12Enable /LARGEADDRESSAWARE compiler flag for windows compilingTank_Master
This allows the app to allocate up to 4GB memory on 64bit hosts and 32bit hosts with PAE instead of 2GB 32bit stock OSs will still be limited to 2GB, with no bemnifit or negigitive impact This has the benifit of not crashing the viewer when the viewer memory exceeds 2GB on 64bit hosts Linux and Mac by nature use up to 4GB for a 32bit app, even on a 32bit host
2012-06-11storm-1843: remove unused ParcelMediaURLFilter codeKadah_Coba
2012-06-11Merge viewer HTTP test repositoryTank_Master
2012-06-11remove tooltip when hovering over main volume icon in the status barTank_Master
2012-06-10STORM-1878: Blocking an avatar does not derender worn lightsMartinRJ Fayray
2012-06-08STORM-1877 Missing entries in strings.xml for some Inventory folder namesJonathan Yap
2012-06-08SH-3153 FIXBrad Payne (Vir Linden)
2012-06-08merge changes for DRTVWR-162Oz Linden
2012-06-07remove gear iconTank@Test_Master.ftrdhcpuser.net
2012-06-07widen the floater a bit to make more room for translationsTank@Test_Master.ftrdhcpuser.net
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-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-04MAINT-1142 use VBO pooling on OSXAura Linden
2012-05-29move floater over so it is not partly off screenTank_Master
2012-05-29Add individual volume controls to pannel_volume_pulldownTank_Master
Also includes translations for some of the other languages
2012-05-29merge changes for DRTVWR-153Oz Linden
2012-05-29merge changes for DRTVWR-155Oz Linden
2012-05-29merge changes for DRTVWR-148Oz Linden
2012-05-26merge changes for DRTVWR-156Oz Linden
2012-05-25Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148simon@Simon-PC.lindenlab.com
2012-05-24merge changes for DRTVWR-154Oz Linden
2012-05-24merge changes for DRTVWR-151Oz Linden
2012-05-24FIX VWR-23844 VWR-26542 VWR-28950eli
2012-05-24sync with viewer-releaseeli
2012-05-22merge changes for DRTVWR-152Oz Linden
2012-05-22merge changes for DRTVWR-149Oz Linden
2012-05-22merge changes for DRTVWR-147Oz Linden
2012-05-21MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
- Fix for potential truncation
2012-05-18MAINT-959 FIX [PUBLIC]Trouble resizing tabbed floatersRichard Linden
don't auto position other floater when it is hosted
2012-05-18MAINT-938 ADDITIONAL FIX (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
- Requested permissions are added dynamically to the dialog's footer - And the footer is not shown when it is empty
2012-05-17MAINT-1092 Fix for broken avatar bakes on some AMD graphics cards.Dave Parks
2012-05-17MAINT-938 FIXED (Make debit-permissions dialog give a stronger warning)Paul ProductEngine
- Added new tag called "footer" to the notification. This tag allows to display messages under the buttons in toasts. - Created new class LLToastScriptQuestion for the "ScriptQuestionCaution" notification. This notification supports tag <footer>.
2012-05-16MAINT-862 and ER-1781 : Sounds not playing the first time. Reviewed by Kelly.simon@Simon-PC.lindenlab.com
2012-05-16FIX VWR-23844 VWR-26542 VWR-28950eli
2012-05-14partial fix for SH-3132 - reduce max concurrent http requests to same level ↵Brad Payne (Vir Linden)
as in release