summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-18CHUI-119 fixed bug with creating multiply instances of the nearby chat;AlexanderP ProductEngine
2012-06-15MergeAlexanderP ProductEngine
2012-06-14Pull merge from richard/viewer-chuiMerov Linden
2012-06-14CHUI-139 : Use the Chat toolbar button to open and close the conversations ↵Merov Linden
multi floater. Force Nearby Conversation if floater is empty.
2012-06-14CHUI-199 WIP Modified the nearby chat for using floater_im_session.xml; ↵AlexanderP ProductEngine
merging LLNearbyChatBar with LLNearbyChat; clean up code; supressed a double creation of LLNearbyChat
2012-06-14CHUI-144 FIXED Residents picker added to Conversations panel + button.Seth ProductEngine
2012-06-13EXP-137 : Comments cleanupMerov Linden
2012-06-13CHUI-120 WIP Modified chat participants drag and drop not to use LLClipboard.Seth ProductEngine
2012-06-13CHUI-120 WIP Fix for crash after closing the chat floater.Seth ProductEngine
2012-06-12CHUI-119 WIP Suppressed of the warnings (XML corrected); fixed the torn-off ↵AlexanderP ProductEngine
button's states
2012-06-11CHUI-137 : Implemented tear off and close of conversation in the listMerov Linden
2012-06-11CHUI-137 : Implemented switch conversation in the conversation listMerov Linden
2012-06-11CHUI-119 WIP Fixed some bugsAlexanderP ProductEngine
2012-06-08CHUI-137 : Fix build error after mergeMerov Linden
2012-06-08Merge pull from richard/viewer-chuiMerov Linden
2012-06-08CHUI-137 : Implement conversation list, temporary solution: add but doesn't ↵Merov Linden
take out items from the list
2012-06-08Merge pull from richard/viewer-chuiMerov Linden
2012-06-08Fix post merge build issue: take clipboard changes into accountMerov Linden
2012-06-08CHUI-137 : Fix crasher in item drawingMerov Linden
2012-06-08Merge pull from richard/viewer-chuiMerov Linden
2012-06-08CHUI-103 FIXED Added a square brackets to system messages; changed a default ↵AlexanderP ProductEngine
color for user messages
2012-06-07Pull test fixes from : nat/viewer-llhttpclient-tests/Merov Linden
2012-06-07Merge : pull from lindenlab/viewer-releaseMerov Linden
2012-06-08CHUI-122 FIX Add button enabled only for P2P and ad hoc IM sessions.Seth ProductEngine
2012-06-08CHUI-120 WIP Added conversations participants drag and drop from avatar ↵Seth ProductEngine
lists to IM floaters. - Added new drag and drop type DAD_PERSON and source SOURCE_PEOPLE to avoid highliting the toolbars when using SOURCE_VIEWER. - Disabled calling card drop support as it is considered obsolete.
2012-06-08CHUI-120 WIP Added avatar picker that allows to add other users to an ↵Seth ProductEngine
existing chat if they don't participate in it already.
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-06CHUI-137 : Implement temporary conversations list (not working yet)Merov Linden
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-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-01Build fixAlexanderP ProductEngine
2012-06-01CHUI-119 FIXED Bug fixed. Clean up a codeAlexanderP ProductEngine
2012-05-31CHUI-119 WIPSeth ProductEngine
2012-05-30Build fixAlexanderP ProductEngine
2012-05-30CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-containerAlexanderP ProductEngine
2012-05-29CHUI-105 WIP Fixed "is not a child of" warning when removing a tab from ↵Seth ProductEngine
LLSideTrayPanelContainer.
2012-05-28inconsequential change to force new ticket numberOz Linden
2012-05-25CHUI-131 FIX Crash when selecting Show on inventory offer notification if ↵Richard Linden
other notifications are being received
2012-05-25CHUI-132 FIX Modal dialogs cannot be dismissedRichard Linden
2012-05-24CHUI-78 FIXED group actions gear menu in People->Groups.Seth ProductEngine
Used the same menu for groups list context menu and gear menu in People->Groups. Changed the type of groups list context menu to toggleable.
2012-05-24Added tag viewer-release-candidate, 3.3.2-release for changeset 675668bd24d3Oz Linden
2012-05-22Linux build fixPaul ProductEngine
GCC does not allow local functor classes to be used with template algorithms, because template arguments must refer to an entity with external linkage.
2012-05-22Added tag 3.3.2-beta2 for changeset 675668bd24d3Oz Linden
2012-05-22merge changes for DRTVWR-150Oz Linden