Commit Graph

23012 Commits (18aabdfd3d2efc1b5507e2fe001cfc36ee84b710)

Author SHA1 Message Date
Paul ProductEngine 18aabdfd3d CHUI-127 FIXED (Make chat field auto resizable)
- Replaced LLLineEditor with newly created LLChatEntry
- Moved some functionality (such as setting label) to the LLTextBase as it can be useful to the other derived classes
2012-06-19 09:44:40 +03:00
AlexanderP ProductEngine 7edcbb1613 CHUI-100 WIP Fix translate chat checkbox showing 2012-06-18 23:20:17 +03:00
AlexanderP ProductEngine bc5e0eda1b CHUI-119 fixed bug with creating multiply instances of the nearby chat; 2012-06-18 21:11:56 +03:00
AlexanderP ProductEngine 5207da8a63 Merge 2012-06-15 14:39:37 +03:00
Merov Linden 22133d281d Pull merge from richard/viewer-chui 2012-06-14 16:59:05 -07:00
Merov Linden c238027dd9 CHUI-139 : Use the Chat toolbar button to open and close the conversations multi floater. Force Nearby Conversation if floater is empty. 2012-06-14 16:47:43 -07:00
AlexanderP ProductEngine 51a39b5ac6 CHUI-199 WIP Modified the nearby chat for using floater_im_session.xml; merging LLNearbyChatBar with LLNearbyChat;
clean up code; supressed a double creation of LLNearbyChat
2012-06-14 20:00:41 +03:00
Seth ProductEngine d34746b596 CHUI-144 FIXED Residents picker added to Conversations panel + button. 2012-06-14 17:37:16 +03:00
Merov Linden b01ab3b9b2 EXP-137 : Comments cleanup 2012-06-13 13:52:26 -07:00
Seth ProductEngine 569146f27c CHUI-120 WIP Modified chat participants drag and drop not to use LLClipboard. 2012-06-13 21:21:19 +03:00
Seth ProductEngine b50349ab84 CHUI-120 WIP Fix for crash after closing the chat floater. 2012-06-13 19:26:17 +03:00
AlexanderP ProductEngine 9993fa550a CHUI-119 WIP Suppressed of the warnings (XML corrected); fixed the torn-off button's states 2012-06-12 21:56:00 +03:00
Merov Linden 0e2f5c2eba CHUI-137 : Implemented tear off and close of conversation in the list 2012-06-11 22:12:43 -07:00
Merov Linden db67c21f90 CHUI-137 : Implemented switch conversation in the conversation list 2012-06-11 17:25:17 -07:00
AlexanderP ProductEngine ec726c3a3e CHUI-119 WIP Fixed some bugs 2012-06-11 17:04:58 +03:00
Merov Linden e286330365 CHUI-137 : Fix build error after merge 2012-06-08 17:58:15 -07:00
Merov Linden ac6f0304c5 Merge pull from richard/viewer-chui 2012-06-08 17:29:56 -07:00
Merov Linden 1aba6c119e CHUI-137 : Implement conversation list, temporary solution: add but doesn't take out items from the list 2012-06-08 17:26:13 -07:00
Merov Linden cdb57cb299 Merge pull from richard/viewer-chui 2012-06-08 12:16:56 -07:00
Merov Linden 1807796514 Fix post merge build issue: take clipboard changes into account 2012-06-08 12:15:36 -07:00
Merov Linden 3f7ecef196 CHUI-137 : Fix crasher in item drawing 2012-06-08 11:31:50 -07:00
Merov Linden b4a53226c8 Merge pull from richard/viewer-chui 2012-06-08 10:40:32 -07:00
AlexanderP ProductEngine 33adfe0947 CHUI-103 FIXED Added a square brackets to system messages; changed a default color for user messages 2012-06-08 19:51:56 +03:00
Merov Linden fa0c34afc6 Pull test fixes from : nat/viewer-llhttpclient-tests/ 2012-06-07 22:41:40 -07:00
Merov Linden bc54f1bb89 Merge : pull from lindenlab/viewer-release 2012-06-07 22:30:54 -07:00
Seth ProductEngine f7f85dd0dd CHUI-122 FIX Add button enabled only for P2P and ad hoc IM sessions. 2012-06-08 01:09:00 +03:00
Seth ProductEngine 9b92235291 CHUI-120 WIP Added conversations participants drag and drop from avatar 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-08 01:08:58 +03:00
Seth ProductEngine 8353a1ab4d CHUI-120 WIP Added avatar picker that allows to add other users to an existing chat if they don't participate in it already. 2012-06-08 01:08:56 +03: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
Merov Linden 85e553638e CHUI-137 : Implement temporary conversations list (not working yet) 2012-06-06 19:37:59 -07: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
Todd Stinson 05d721cecf Pull and merge a single changeset from http://hg.lindenlab.com/nat/viewer-maint-1144/ to resolve build issues. 2012-06-06 16:43:39 -07: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
Seth ProductEngine d11f542ffe CHUI-120 WIP Added starting ad hoc conference in the same floater as P2P 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-07 00:59:05 +03:00
AlexanderP ProductEngine 164e107395 CHUI-103 Added square brackets to a messages from Second Life in the plain text mode; changed the default colors of user's messages 2012-06-05 18:20:01 +03:00
AlexanderP ProductEngine 30a6da68bc Build fix 2012-06-01 16:36:58 +03:00
AlexanderP ProductEngine b7b6125001 CHUI-119 FIXED Bug fixed. Clean up a code 2012-06-01 14:57:51 +03:00
Seth ProductEngine bba0f4f74e CHUI-119 WIP 2012-05-31 16:37:22 +03:00
AlexanderP ProductEngine fe252836eb Build fix 2012-05-30 22:58:22 +03:00
AlexanderP ProductEngine 47ec4faeb4 CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-container 2012-05-30 19:58:20 +03:00
Seth ProductEngine 2286dcb73b CHUI-105 WIP Fixed "is not a child of" warning when removing a tab from LLSideTrayPanelContainer. 2012-05-29 02:12:51 +03:00
Oz Linden a519e34f02 inconsequential change to force new ticket number 2012-05-28 09:23:24 -04:00
Richard Linden 8a2b6f7d2e CHUI-131 FIX Crash when selecting Show on inventory offer notification if other notifications are being received 2012-05-25 12:04:12 -07:00
Richard Linden d713925f43 CHUI-132 FIX Modal dialogs cannot be dismissed 2012-05-25 11:39:37 -07:00
Seth ProductEngine 61d550ee85 CHUI-78 FIXED group actions gear menu in People->Groups.
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-24 19:20:37 +03:00
Oz Linden b2b446aed7 Added tag viewer-release-candidate, 3.3.2-release for changeset 675668bd24d3 2012-05-24 10:01:24 -04:00
Paul ProductEngine 4dffa33514 Linux build fix
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-22 20:34:34 +03:00