Commit Graph

101 Commits (ae6d93f759d65668a5dbe4b292772f57e1cea6e0)

Author SHA1 Message Date
Ansariel ae6d93f759 FS communication UI: Fixing notification handlers 2013-06-29 04:13:30 +02:00
Ansariel a8cbee6e81 More compile fixes and hooking up of FS communication UI 2013-06-28 23:34:21 +02:00
Tank_Master c61db3d380 Merge LGPL tip 2013-06-26 12:59:37 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Kitty Barnett 45afaf7156 - internal : comment out dead code that would start an IM session
--HG--
branch : RLVa
2013-05-10 13:46:19 +02:00
Kadah_Coba b9028b5a2e Improved logging of group notices to group IM log 2013-06-06 13:54:16 -07:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08:00
William Todd Stinson 9da625d439 CHUI-494: WIP First pass at getting the suppression of events in DND working. 2012-12-06 20:28:25 -08:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
Gilbert Gonzales 23d58c0c09 CHUI-433: Implemented an alternate solution to the problem. The original solution was ambiguous and incomplete and also preserved an existing hack. The new solution removes a hack/deprecated code (setActiveSession/getActiveSession functions). Basically, a toast message is not displayed if the user already has the conversation in focus. When the conversation floater loses focus toasts message will be displayed for that conversation. 2012-10-22 17:31:51 -07:00
Kelly Washington c6a5b62152 MAINT-994 Oskar Linden login issues
* Set max persistent notifications to 250
* Don't register for notification callbacks until after peristent ones are loaded.
reviewed with Simon
2012-09-26 14:40:16 -07:00
AlexanderP ProductEngine d9309bd163 CHUI-323 FIXED (Local chat message panel out of position in Conversation floater):
Prevented too early creation LLNearbyChat
2012-09-07 12:34:21 +03:00
AlexanderP ProductEngine ae2e611dfb CHUI-315 (Nearby chat messages do not appear in conversation floater): cancelled inheritance LLNearbyChat from LLSingleton; set mSingleInstance flag for it. 2012-08-31 16:52:50 +03:00
AlexanderP ProductEngine 14708a3ace CHUI_310 make NearbyChat a singletone 2012-08-22 18:27:29 +03:00
Ansariel fc9f1252e1 Merge with Firestorm LGPL tip 2013-03-19 09:51:23 +01:00
Cinders c201694f26 Don't show RadarAlert or StreamMetadata notifications in nearby chat. If the user elects for that, they can use the default reportToNearbyChat modes 2013-03-16 18:32:35 -06:00
Ansariel 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
Tank_Master 6207030884 Merge FS LGPL tip 2013-02-23 17:09:53 -08:00
Kitty Barnett d5f93071b5 Merge with RLVa tip for viewer-sunshine 2013-02-15 19:26:00 +01:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Kitty Barnett 9c395aa0c6 Merged with default tip (Revision f958326781de)
--HG--
branch : RLVa
2012-07-16 01:01:09 +02:00
Todd Stinson 68c3d1bb2e EXP-1953: First pass at implementing the maturity flow during a teleport via lure. 2012-06-08 18:28:19 -07:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
Richard Linden 296e55c1b3 CHUI-112 FIX Clicking Show or Discard in an inventory offer toast does not dismiss toast
removed special case logic for dealing with user online/offline collisions
added ability to cancel old duplicate notifications
2012-05-18 13:20:32 -07:00
Seth ProductEngine dd012cc375 CHUI-87 FIXED crash in handling notifications after viewer disconnect.
Notification handlers now use LLHandles to screen channels.
2012-04-12 23:09:47 +03:00
Richard Linden a0bb55adc6 merge with viewer-release 2012-04-26 14:39:52 -07:00
Richard Linden 2fa1c42aad CHUI-51 WIP notifications routig code cleanup
phase 2, removal of extraneous signaling in favor of llnotificationchannels
made notificationchannels work better with overrides and lifetime managed
by creator
2012-03-29 23:48:29 -07:00
Richard Linden 1ea65f0285 CHUI-51 WIP notifications routig code cleanup
phase 1, removal of most of llnotificationhandler
2012-03-27 22:56:02 -07:00
Tank_Master e61c20d499 Merge LL 3.3.1 Viewer Release 2012-04-26 17:31:35 -07:00
Kitty Barnett 362a231df1 Merged with .RLVa tip
--HG--
branch : RLVa
2012-05-17 15:33:56 +02:00
ziree 906dea62dc Nearby chat working, toolbar layouts mostly behaving. 2012-01-27 23:29:53 +01:00
Nicky 1714747536 After merge compare FS tree agsindt V/dev.
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
Nicky 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
Ansariel 700a79e328 Tip notifications now also go to chat console if the console is enabled. Fixes FIRE-4290 2012-01-04 11:22:36 +01:00
Kitty Barnett 866eeb7897 Merged with default tip (Revision 913d90c3225b)
--HG--
branch : RLVa
2011-11-04 17:40:17 +01:00
Leyla Farazha 0207d7e9e4 EXP-1247 Nearby chat as part of chat floater 2011-09-27 15:41:06 -07:00
Kitty Barnett 74aff082df Merged with .RLVa tip
--HG--
branch : RLVa
2011-08-06 20:06:42 +02:00
Seth ProductEngine 4993cfba34 STORM-941 FIXED IM history to use the resident's user name for the log file name.
Added conversions from legacy names or SLURLs with avatar id to the user names in cases of logging P2P sessions and inventory offers.
Removed asynchronous writes to temporary IM log file depending on name cache responses.
2011-04-13 18:13:02 +03:00
Kitty Barnett eeb35533c7 - added : @startim[:<uuid>]=n|y and @startimto:<uuid>=n|y
--HG--
branch : RLVa
2011-04-12 12:33:34 +02:00
Kitty Barnett 4d30c61192 - internal : imported UI-Notifications patch
-> helps cut down on instances where a remotely initiated action results in spawning an IM window

--HG--
branch : RLVa
2011-04-12 00:10:45 +02:00
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
Kitty Barnett 825d5bc58e Merged with RLVa-1.3.1c 2011-06-03 21:38:34 +02:00
Kitty Barnett 3a9c08aa5f Imported Chat-Logs patch from Catznip (revision e6e0393682f8)
-> Description:
- changed : LLCacheName::buildUsername() will properly extract the username if the passed name is a "complete name"
    -> "Catznip Catnap" => "catznip.catnap"
    -> "Catznip Tester (catznip.catnap)" => "catznip.catnap"
- fixed   : P2P IM session names are inconsistent (chiclet hover tip shows the legacy name rather than the complete name for incoming IM sessions)
    -> incoming IM session would have a session name of "Catznip Catnap" (legacy name)
    -> outgoing IM session would have a session name of "Catznip Tester (catznip.catnap)" (complete name)
    -> standarized P2P IM session names to "complete name"
- added   : LLIMModel::buildIMP2PLogFilename() to have one single function to construct log filenames for P2P IMs
- fixed   : teleport offers to another avie are logged to the wrong file when no IM session is open for that avie
    -> open IM session => logged to "catznip_catnap.txt"
    -> no open IM session => logged to "Catznip Catnap.txt"
- fixed   : inventory offers to another avie are logged to the wrong file when no IM session is open for that avie
    -> no open IM session => logged to "Catznip Catnap.txt"
- fixed   : inventory accepted/declined notifications are logged to the wrong file
    -> no open IM session => logged to secondlife____app_agent_<uuid>_completename.txt
- added   : "UseLegacyIMLogNames" setting to use "old-style" log filenames for P2P IM sessions (TRUE by default)
    -> needed for people who mix older and newer viewers
    -> side-steps any other remaining bugs due to log filename change
2011-01-26 00:19:43 +01:00
Leyla Farazha 60db8577a9 Merge 2010-09-16 12:02:24 -07:00
Tofu Linden 68a974e337 Bunch of trivial typo fixes that were bothering me on another branch! 2010-09-13 20:28:17 +01:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Leyla Farazha 0789897d61 removed "SESSION_NAME" in favor of doing a gCacheName lookup
reviewed by James
2010-06-02 16:31:05 -07:00
James Cook 2b7153c26a merge from dessie/viewer-public right before SLE code landed 2010-05-11 16:11:09 -07:00
Alexei Arabadji 00360bb1cd EXT-7097 FIXED
Replaced usage usage of "ObjectGiveItemUnknownUser" notification with functionality provided by LLPostponedNotification class;
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/345/

--HG--
branch : product-engine
2010-05-06 10:09:24 +03:00