63ef2950e9
CHUI preparation phase 1: Move FS-specific communication parts into a separate domain and out of the way for CHUI merge to reduce conflicts
...
* LLChatHistory moved to FSChatHistory
* LLFloaterNearbyChat moved to FSFloaterNearbyChat
* LLIMFloater moved to FSFloaterIM
* LLIMFloaterContainer moved to FSFloaterIMContainer
* LLNearbyChatbarListener moved to FSNearbyChatbarListener
* LLNearbyChatControl moved to FSNearbyChatControl
* LLNearbyChatHub moved to FSNearbyChatHub
* floater_im_container.xml moved to floater_fs_im_container.xml
* floater_im_session.xml moved to floater_fs_im_session.xml
* floater_nearby_chat.xml moved to floater_fs_nearby_chat.xml
* widget chat_history.xml moved to fs_chat_history
* widget nearby_chat_control.xml moved to fs_nearby_chat_control.xml
2013-02-28 18:57:38 +01:00
bd86a614b8
Refactored chat console handling:
...
* Created new class FSConsoleUtils to handle console-related tasks
* Moved IM in console handling from IMHandler to FSConsoleUtils
* IMHandler is now stock V3 and will produce no problems anymore once it goes away with CHUI
* Nearby chat handling moved from LLNearbyChatHandler to FSConsoleUtils
* LLNearbyChatHandler::processChat() is now mostly stock V3 to reduce problems with CHUI
* (Group-)IMs in chat console settings are now independent from their corresponding toasts counterparts and can be set independently
2013-02-27 14:09:28 +01:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
d5f93071b5
Merge with RLVa tip for viewer-sunshine
2013-02-15 19:26:00 +01:00
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
4aba64e7ba
FIRE-9151: Fix chat floater (re-)gaining focus when muting group chats
2013-02-07 13:58:05 +01:00
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
d587b61ca5
Speeded up UI Sounds checks for IMs a little
2013-01-11 10:19:17 +01:00
71bd3aecce
Comment out useless spammmy log message.
2012-12-29 09:23:31 -06:00
1468a8a4e3
FIRE-8601: Use system name instead of NULL for typing start IM notification.
2012-12-14 07:11:12 -06:00
7316bc44d9
Added the option for Incoming IM sound alerts on all messages received while the IM session is not in focus [Addition to FIRE-7556]
2012-12-11 17:34:04 +01:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
9c395aa0c6
Merged with default tip (Revision f958326781de)
...
--HG--
branch : RLVa
2012-07-16 01:01:09 +02:00
d68709dacb
FIRE-7843: Fixed typo in "autoresponce"
2012-10-03 01:08:40 +02:00
6761dfe092
Fire-5389 - "Autoresponse Sent" message added to Firestorm as was in Phoenix
2012-10-02 11:14:32 -07:00
3ee3ca4bf5
Backed out changeset: b42b536efcd3
...
Forgot comments
2012-10-02 11:09:04 -07:00
ba3c40d295
Fire-5389 - "Autoresponse Sent" message added to Firestorm as was in Phoenix
2012-10-01 17:14:09 -07:00
3508c005ed
FIRE-3747: Different IM sound for group and private IM chat messages
2012-09-13 19:24:23 +02:00
3d3af92932
Fixing minor comment typos
2012-09-06 03:02:11 +02:00
fc4ed25ea6
Some code convention fixes
2012-09-05 21:38:30 +02:00
bab51c0339
FIRE-7556: Configurable User Interface sounds, sound for each IM session message
2012-09-05 20:13:20 +02:00
e4cd16fbad
FIRE-1379: Additional option to only mute group chats of a particular group - by Katharine Berry (Exodus Viewer)
2012-08-11 12:13:28 +02:00
78f2663c4a
Automated merge with http://hg.secondlife.com/viewer-release
2012-04-26 14:04:55 -04:00
c104c887c5
Mac build fix.
2012-04-17 17:36:22 +03:00
cbbbbcb6c3
MAINT-180 FIXED Reject group and ad-hoc chat messages from lindens when we are busy.
2012-04-02 20:36:52 +03:00
633bd44b4a
merge changes for vmrg-225
2012-03-09 12:58:50 -05:00
cb429159b8
FIRE-787 / FIRE-5570: IM processing portions of these functions.
2012-06-30 22:23:16 -05:00
0f8085320a
FIRE-6650: Only check for non-friends in ad hoc conferences when user selects "only groups and friends can IM me". From MartinRJ Fayray in VWR-29148/STORM-1890.
2012-06-23 15:35:32 -05:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
6db3ceccd4
Make auto-responses work when announce incoming IMs are enabled (FIRE-49)
2012-05-12 23:24:02 +02:00
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
ecf6565d9d
Fixed: FIRE-5230 - Chat Console Improvement: Replacing the "IM" in front of group chat messages with the actual group name
2012-04-13 09:31:41 -07:00
362a231df1
Merged with .RLVa tip
...
--HG--
branch : RLVa
2012-05-17 15:33:56 +02:00
ddc6afdd81
Merged with default tip (Revision f8183e357a6f)
...
--HG--
branch : RLVa
2012-04-21 22:29:42 +02:00
b7d7323345
Show IMs in console also if sender's IM panel has focus
2012-02-19 12:29:00 +01:00
9003c4c54b
STORM-1795 Small logic/formatting change
2012-01-23 17:43:05 -05:00
ab5f9d22ee
Added missing space in log message
2012-02-06 23:18:11 +01:00
44436d0240
STORM-1795 Fixed misspelled variable
2012-01-20 14:26:45 -05:00
d70d57c938
STORM-1795 Fix logic error
2012-01-20 14:15:31 -05:00
82e90a6af5
EXP-901 FIXED (Can see "typing" messages from users who are not allowed to IM you)
...
- If "Only friends and groups can IM me" option is ON but the user got message from non-friend, show notification one time per session.
2012-01-20 08:59:37 +02:00
da40427a0b
STORM-1795 Ad-hoc messages are received even when "Only friends and groups can call or IM me"
2012-01-16 14:27:35 -05:00
906dea62dc
Nearby chat working, toolbar layouts mostly behaving.
2012-01-27 23:29:53 +01:00
415aadc959
Merged with default tip (Revision 3a521e980fbf)
...
--HG--
branch : RLVa
2012-01-09 13:22:40 +01:00
2c9db624fb
STORM-1731 Adjusted if muted logic slightly
2011-12-12 14:48:36 -05:00
f2d2e7e489
STORM-1731 Changes per RB comments: changed llwarns to llinfos, added check so you cannot mute a Linden
2011-12-12 11:32:34 -05:00
a03b3aaa60
STORM-1731 Ad-hoc confererence block failing. Residents using it to start massive multi-sim conferences, used as a griefing tool.
2011-12-12 08:51:16 -05:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
2ae2d34bdb
Merged with default tip (Revision 9e390d76807f)
...
--HG--
branch : RLVa
2011-11-07 16:11:42 +01:00
866eeb7897
Merged with default tip (Revision 913d90c3225b)
...
--HG--
branch : RLVa
2011-11-04 17:40:17 +01:00
8448e3b86e
EXP-1398 FIX -- Viewer Crash when moving Speak button from bottom toolbar to side toolbar with call request dialog active on Mac
...
* Added "on button removed" callback for toolbars.
* Changed docking on incoming and outgoing call floaters to be undocked when "speak" button removed.
Reviewed by Leyla.
2011-10-25 14:14:46 -07:00
Ansariel