c4d557d529
Merged with default tip (Revision aeab2661776f)
...
--HG--
branch : RLVa
2014-10-29 21:45:12 +02:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
40762b7643
MAINT-3110 FIXED new crash in LLNotificationsUI::LLHandlerUtil::logToIMP2P
2013-09-06 20:16:52 +03:00
7dd730473b
Merged with default tip (Revision 35f1667645bc)
...
--HG--
branch : RLVa
2013-10-09 22:49:44 +02:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
45afaf7156
- internal : comment out dead code that would start an IM session
...
--HG--
branch : RLVa
2013-05-10 13:46:19 +02:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
9da625d439
CHUI-494: WIP First pass at getting the suppression of events in DND working.
2012-12-06 20:28:25 -08:00
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
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
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
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
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
14708a3ace
CHUI_310 make NearbyChat a singletone
2012-08-22 18:27:29 +03:00
68c3d1bb2e
EXP-1953: First pass at implementing the maturity flow during a teleport via lure.
2012-06-08 18:28:19 -07:00
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
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
a0bb55adc6
merge with viewer-release
2012-04-26 14:39:52 -07:00
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
1ea65f0285
CHUI-51 WIP notifications routig code cleanup
...
phase 1, removal of most of llnotificationhandler
2012-03-27 22:56:02 -07:00
0207d7e9e4
EXP-1247 Nearby chat as part of chat floater
2011-09-27 15:41:06 -07:00
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
60db8577a9
Merge
2010-09-16 12:02:24 -07:00
68a974e337
Bunch of trivial typo fixes that were bothering me on another branch!
2010-09-13 20:28:17 +01:00
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
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
0789897d61
removed "SESSION_NAME" in favor of doing a gCacheName lookup
...
reviewed by James
2010-06-02 16:31:05 -07:00
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
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
831dd9ca40
Partial display name support in money transaction notifications
2010-04-30 17:32:27 -07:00
4992eaf27d
fixed EXT-2801 Record "object return" notification into IM history, not chat history,
...
* added class for LLPostponedNotification to rpovide possibility postpone adding notification to notifications system till sender avatar name will be received from cache name;
* rolled back changes related to fix of EXT-4779;
* avoided passing avatar id when logging 'Object Return' notification to nearby chat;
eviewed by Vadim Savchuk at https://jira.secondlife.com/browse/EXT-6373
--HG--
branch : product-engine
2010-04-01 15:24:36 +03:00
be58f87ebb
Remove some notifications eliminated in merge
2010-03-30 11:53:40 -07:00
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
54a3f1051e
fixed EXT-6489 “"User not online - inventory has been saved" should be logged to IM log”,
...
reviewed by Mike Antipov at
https://codereview.productengine.com/secondlife/r/90/
--HG--
branch : product-engine
2010-03-25 17:53:25 +02:00
c5c72899f3
Fixed normal subtask EXT-6441 - Do not show "friendship accepted" toast if respective IM window is open and in focus.
...
Minor changes to supress toast for FriendshipAccepted notification.
--HG--
branch : product-engine
2010-03-23 10:10:15 +02:00
a2150863f9
Updated normal task EXT-5905 - Resolving offers.
...
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer).
--HG--
branch : product-engine
2010-03-19 17:18:53 +02:00
167be8f755
Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2010-03-19 17:18:52 +02:00
63251d8b31
opened and fixed EXT-6478 “Loggable messages that not increments IM counter doesn't shows in IM window”,
...
added update of IM floater messages on logging to IM session;
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/75/
--HG--
branch : product-engine
2010-03-19 17:17:00 +02:00
1c4eeed50f
fixed EXT-6451 Name of people sending a IM some times is NoBody
...
LLSD::maps keys accross the code are used in mix of cases, lower and upper.
Using "from_id" and "FROM_ID" causes avatar id to be null and thus "no body" was displayed.
BUT this fix is of no use since several minutes ago viewer-offers feature was merged into release,
which overrides avatar name with "Second Life" to display message about teleport offering as system message
Reviewed by Q at https://codereview.productengine.com/secondlife/r/72/
--HG--
branch : product-engine
2010-03-19 16:35:45 +02:00
b5ba328480
EXT-5904 “Offers embedding into IM windows”,
...
added restoring IM counters when logging message;
--HG--
branch : product-engine
2010-03-16 17:50:14 +02:00
2fed8d5182
fixed EXT-5904 “Offers embedding into IM windows”,
...
corrected offer counter(used silent adding message to session without
incrementing counter);
avoided assertion when received offer from blocked avatar with closed IM
session;
--HG--
branch : product-engine
2010-03-16 14:48:20 +02:00
e7027a57e1
fixed EXT-5904 “Offers embedding into IM windows”,
...
revised embedding and logging offer notification to provide loading log entry
in case notification doesn't exist;
--HG--
branch : product-engine
2010-03-11 17:53:49 +02:00
51ae05baa8
Automated merge with https://hg.productengine.com/secondlife/viewer-offers/
...
--HG--
branch : product-engine
2010-03-10 20:06:22 +02:00
ccbbfeb0a0
fixed EXT-5904 “Offers embedding into IM windows”,
...
shortened timestamp of embedded offers;
unified sender name of session message entry and file log entry for system messages;
--HG--
branch : product-engine
2010-03-10 20:03:28 +02:00
3ab788b14f
Implemented normal sub-task EXT-5909(Accepted/declined inventory offer shouldn't spawn chiclet).
...
- Removed check for INVENTORY_DECLINED from LLHandlerUtil::canSpawnIMSession().
- Added new method LLHandlerUtil::canSpawnToast() and check with it to LLTipHandler::processNotification() to supress toasts when respective IM window is open.
--HG--
branch : product-engine
2010-03-10 19:50:24 +02:00
b2f6cab24f
fixed EXT-5910 “Offers logging”,
...
replaced interactive system message marker with correct from string value when
message logged without adding to the session;
--HG--
branch : product-engine
2010-03-10 19:24:56 +02:00
7238ce8345
Implemented normal sub-task EXT-5950(Do not spawn IM chiclet for "drop on avatar" inventory offers).
...
- Removed check for INVENTORY_ACCEPTED from LLHandlerUtil::canSpawnIMSession().
--HG--
branch : product-engine
2010-03-09 17:55:53 +02:00
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
Kitty Barnett