Commit Graph

78 Commits (63ef2950e94522cf3b2eaa13da93068ecb77d933)

Author SHA1 Message Date
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
PanteraPolnocy d00f764e2a Attempt to speed up things a little 2013-01-13 23:08:22 +01:00
Ansariel 5e7cc3135b Made friend mapping list on worldmap respect display name settings 2012-12-29 21:54:57 +01:00
PanteraPolnocy 8fcf4829a4 FIRE-7625: Option to display group chats, IM sessions and nearby chat always in uppercase 2012-10-21 01:52:50 +02:00
Ansariel f899864008 FIRE-3248: Disable add friend button on IM floater after avatar has been added as friend 2012-09-30 14:04:10 +02:00
PanteraPolnocy acc823f712 FIRE-2731: Online/offline sound alerts for friends; proper button disabling in UI sounds panel for object deletion 2012-09-27 22:07:45 +02:00
Nicky 86ebba6d18 FIRE-6077; FIRE-6227; FIRE-6431; SUP-9654; Next try. Make sure the observer set we iterate over gets not changed during iteration. 2012-06-04 15:33:01 +02:00
Nicky 87937c3c26 Backout of f7a307991f41. That was not the golden fix for FIRE-6077; FIRE-6227; FIRE-6431; SUP-9654. Backout so we don't differ from LLs codebase for no reason. 2012-06-04 12:11:37 +02:00
Nicky 67b56f41c7 Backout of 2dd7a775873c. That was not the golden fix for FIRE-6077; FIRE-6227; FIRE-6431; SUP-9654. Backout so we don't differ from LLs codebase for no reason. 2012-06-04 12:11:13 +02:00
Nicky 367117e8ee Depending on destrution order of static objects (compiler dependent), LLAvatarTracker could crash. This should fix it. 2012-05-31 22:01:45 +02:00
Nicky 371c6cb15c FIRE-6077; FIRE-6227; FIRE-6431; SUP-9654; Make sure every LLFriendObserver gets unregistered once it dies. 2012-05-31 00:35:02 +02:00
Liny d876a9bdd8 Adding comments into previous commits to prevent merge messups later. 2012-03-28 23:54:10 -07:00
Liny 97829ae5bf Changing a llwarns into lldebugs to cleanup possable log spam with a large friendslist when SL messes up. 2012-03-28 17:09:05 -07: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
Liny e6caefb11a Adding option to show online/offline friend notices to the chat history window and not the chat console, makes it look more V1 when enabled. 2011-10-31 13:39:57 -07:00
Selo 9ebc2078b6 FIRE-3547 Updated to make sure no double notices are showing up in Nearby Chat 2011-10-15 16:21:36 +02:00
Selo 5445c58007 FIRE-3547 Gave ContactSets the option to control where the notices show up (toasts or nearby chat) and moved around the settings about on-offline notices 2011-10-14 16:41:54 +02:00
Selo 9c12d31e80 FIRE-3547 Restoring old behaviour LLG in combination with nearby chat and toast in combination with FIRE-3522 2011-10-11 00:42:52 +02:00
Selo 6bd4a45766 FIRE-3522 Making on/offline notices to nearby chat independant from enabled in Dialog alerts 2011-10-10 00:49:25 +02:00
LGG@LGG-LAPPY 7e4388d7dd Contact Sets For Firestorm (Comm->Contact Sets) 2011-09-01 09:50:54 -05:00
Kadah_Coba cf62870524 Removed lots of old and unneeded code
Perm mod check boxes now reenable as soon as the new perms take effect
Fixed pay button
Mass perm set functionality tested and working. max of 20 (server limit?)
2011-07-06 01:31:22 -07:00
ziree 9225cc6c96 Take preferences into account when showing online/offline messages for friends. Patch by Ansariel Hiller - FIRE-1226 2011-06-08 22:20:07 +02:00
Arrehn 6c70d222fa Cleaned up excess debug logging. 2011-03-29 21:56:21 -04:00
Tonya Souther a961853667 Send friend on/offline messages to local chat. Optional, defaults on. From Peyton Menges, fixes FIRE-603 and FIRE-484. 2011-03-07 18:19:28 -06:00
Arrehn b2ff2a7400 CRASH FIX: Make sure our IM windows clean up observers on close
Thanks Mindy, Tozh, and all patient others.

--HG--
branch : Firestorm_2.4.1
2011-01-27 13:25:19 -05:00
Kadah 592d4cc751 Kadah's V1 - contacts tab, backported from default
--HG--
branch : Firestorm_2.4.1
2011-01-24 19:53:27 -05:00
Arrehn 2b5f241bb8 Global Visibility Toggle now warns that it takes take to become effective on the server. 2010-12-28 01:40:09 -05:00
Arrehn 835dc44c3d Always-on friend permission icons capture updates 2010-12-15 13:04:55 -05: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 bc7837a697 notification fixes 2010-06-02 11:23:02 -07:00
James Cook 7666922593 Clean up some comments 2010-06-01 06:57:51 -07:00
Leyla Farazha abcdff128c Resident Chooser fixes 2010-05-26 16:24:08 -07:00
Leyla Farazha 216c7d3e9a Mappable Buddies now using new LLAvatarNames
reviewed by James
2010-05-25 14:14:08 -07:00
James Cook e47249777b DEV-50013 Display names for online/offline notifications
Reviewed with Leyla
2010-05-20 14:16:02 -07:00
James Cook 8b52454990 merge pull from dessie/viewer-public, picking up SLE code 2010-05-13 15:47:32 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
James Cook 397fe66910 Fixed merge conflict with online/offline notifications 2010-03-08 11:21:06 -08:00
James Cook 18ebacefcf Merge with viewer 2 beta 4 2010-03-08 10:54:23 -08:00
James Cook fe8d015851 Merge 2010-03-02 14:06:23 -08:00
Dmitry Zaporozhan a24eb0a449 Fixed low bug EXT-5124 - Display buddy icons on online/offline alerts
--HG--
branch : product-engine
2010-02-16 11:54:46 +02:00
James Cook 9dd7924b19 Merge 2010-02-11 10:09:23 -08:00
Eugene Mutavchi 740f1cd2c7 Fixed low bug EXT-5227(Clicking online toasts should spawn IM window)
--HG--
branch : product-engine
2010-02-11 19:56:54 +02:00
Dmitry Zaporozhan ff22967233 Fixed low bug EXT-5124 - Display buddy icons on online/offline alerts
--HG--
branch : product-engine
2010-02-10 13:03:11 +02:00
James Cook c0b7c93c18 Converted all gCacheName->getName to getFullName for SLID compatibility
Also eliminated notification "ObjectGiveItemUnknownUser" because the
SLURL-based name lookup will always retrieve the user name.
Fixed a bug with ObjectGiveItem where the SLURL would be incorrect
for a group.
2010-02-04 20:38:40 -08:00
Mike Antipov c3f2859c9f Reduced header dependency from the "llimview.h"
--HG--
branch : product-engine
2009-12-26 16:35:33 +02:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00