summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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.
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-06-01Build fixAlexanderP ProductEngine
2012-06-01merge latest fixes from KittyOz Linden
2012-06-01CHUI-119 FIXED Bug fixed. Clean up a codeAlexanderP ProductEngine
2012-05-31fix spell checker floater registrationOz Linden
2012-05-31Merged with oz_linden/storm-276Kitty Barnett
2012-05-31STORM-276 FIXED Last word in a line editor isn't spell checkedKitty Barnett
2012-05-31merge changes for storm-276Oz Linden
2012-05-31MAINT-639 Fix for random rainbow effects on some prims.Dave Parks
2012-05-31fix DOS line endingsOz Linden
2012-05-31STORM-276 FIXED Line editor misspells are checked every frameKitty Barnett
2012-05-31STORM-276 FIXED "Add to Ignore" doesn't triggerKitty Barnett
2012-05-31CHUI-119 WIPSeth ProductEngine
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-30Merged with viewer-releaseKitty Barnett
2012-05-30merge changes for DRTVWR-159Oz Linden
2012-05-30tag merge of DRTVWR-159Oz Linden
2012-05-30Build fixAlexanderP ProductEngine
2012-05-30MAINT-616 Fix for mac build.Dave Parks
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
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 03:31:36 +0000