Commit Graph

58 Commits (76876538715e3afbe456e2bf84173bde416d50e6)

Author SHA1 Message Date
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
James Cook 831dd9ca40 Partial display name support in money transaction notifications 2010-04-30 17:32:27 -07:00
Alexei Arabadji 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
James Cook be58f87ebb Remove some notifications eliminated in merge 2010-03-30 11:53:40 -07:00
James Cook ecc2c72650 Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final 2010-03-29 16:55:22 -07:00
Alexei Arabadji 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
Dmitry Zaporozhan 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
Dmitry Zaporozhan 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
Alexei Arabadji 167be8f755 Automated merge with https://hg.productengine.com/secondlife/viewer-2-0/
--HG--
branch : product-engine
2010-03-19 17:18:52 +02:00
Alexei Arabadji 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
Igor Borovkov 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
Alexei Arabadji 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
Alexei Arabadji 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
Alexei Arabadji 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
Alexei Arabadji 51ae05baa8 Automated merge with https://hg.productengine.com/secondlife/viewer-offers/
--HG--
branch : product-engine
2010-03-10 20:06:22 +02:00
Alexei Arabadji 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
Andrew Dyukov 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
Alexei Arabadji 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
Andrew Dyukov 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
James Cook 18ebacefcf Merge with viewer 2 beta 4 2010-03-08 10:54:23 -08:00
Alexei Arabadji 2f9cc80c2e fixed EXT-5910 “Offers logging”,
fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;

--HG--
branch : product-engine
2010-03-05 17:53:32 +02:00
Alexei Arabadji 27283c1de7 fixed EXT-5910 “Offers logging”,
made logging offer notifications as from SecondLife;

--HG--
branch : product-engine
2010-03-05 14:13:37 +02:00
Alexei Arabadji 462ab1c752 fixed EXT-5908 “Accepted friendship notification shouldn't spawn chiclet”,
made not spawn IM chiclet friendship accepted notification;
added friendship accepted notification to syswell chiclet;

--HG--
branch : product-engine
2010-03-05 12:37:06 +02:00
Alexei Arabadji 4e08de74ae merged with viewer-2-0
Enter commit message.  Lines beginning with 'HG:' are removed.

--HG--
branch : product-engine
2010-03-04 14:31:53 +02:00
Alexei Arabadji f54bf2a1ea fixed EXT-5904 “Offers embedding into IM windows”,
made all type offers be embedded to the IM floater;
made showing offer toast if IM floater isn't visible;
corrected IM message counter on showing offer toast;

--HG--
branch : product-engine
2010-03-04 11:35:34 +02:00
Dmitry Zaporozhan 6d5442fbbd Fixed windows build.
--HG--
branch : product-engine
2010-03-04 09:22:55 +02:00
Alexei Arabadji 41c3b459f2 fixed EXT-5685 “Duplicated 'user online/offline' toasts after coming back to
Viewer”,
implemented filtering of exclusive notifications;

--HG--
branch : product-engine
2010-03-03 19:48:16 +02:00
Alexei Arabadji 22676e6d38 EXT-2891 "Group notices should be recorded into group IM history",
corrected logging of stub group notices;

--HG--
branch : product-engine
2010-02-19 15:44:18 +02:00
Alexei Arabadji e492a24a19 fixed EXT-5101 “No feedback provided when accepting a friend request”,
added logging of friendship offer accept/decline;

--HG--
branch : product-engine
2010-02-19 10:57:27 +02:00
Alexei Arabadji 1933a378ea Corrected embedded notification panel message index in session list;
--HG--
branch : product-engine
2010-02-18 17:51:06 +02:00
Alexei Arabadji eec9f20d74 fixed EXT-5006 “One inventory offer cause blinking of both Conversations and
Notifications wells”,
embedded inventory offer panel into IM window;

--HG--
branch : product-engine
2010-02-18 16:05:11 +02:00
Igor Borovkov 4c5a998f79 fixed EXT-5456 Messages from objects are shownas messages from Second Life in nearby chat history from the prev session
Completed things which were agreed on:
- system messages in the log file are prepended with "Second Life:" after the timestamp
- object names set which are parsed extended to object names consisting with any number of words

Side effect:
"Second Life:" is shown as From Name in Nearby Chat when in plain text chat

--HG--
branch : product-engine
2010-02-17 16:09:50 +02:00
James Cook e14a641619 DEV-46234 Group Invite contains SLID with Resident, and
DEV-46231 Pay resident notification contains SLID with Resident last name, and
DEV-46232 Payment confirmation of buy and sell parcel of land contains SLID with Resident in both notifications
Clean up server-side name strings with regex matching.
Reviewed with Simon.
2010-02-16 17:18:36 -08: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
Igor Borovkov 250680a078 fixed EXT-4755 Own context menu in voice chat participants list has 'Add Friend' and 'Pay' enabled
--HG--
branch : product-engine
2010-02-02 17:58:29 +02:00
Igor Borovkov e43d0f1815 fixed EXT-4779 Notifications about objects are saved into ".txt" or "{nobody}.txt" instead of "chat.txt" file
--HG--
branch : product-engine
2010-02-01 16:51:34 +02:00
Tofu Linden 1b5880a18e notifiaction_id -> notification_id
ouch.
2010-01-29 10:46:48 -08:00
Alexei Arabadji 86609394ca fixed major EXT-3643 “Embed friendship offer into IM window”;
--HG--
branch : product-engine
2010-01-29 17:48:10 +02:00
Alexei Arabadji 43bb3d00ec fixed EXT-4643 “IM toasts don't appear after few teleport offers were sent to that avatar”
corrected checking opened active IM session;
corrected restoring active IM session after logging IM notification;

--HG--
branch : product-engine
2010-01-26 18:25:42 +02:00
Mike Antipov 4c4c788728 Fixed normal bug EXT-3643 (Make Friend Offer dialog a modal alert)
-- made dialog a modal alert
-- logging to IM is left as it was

--HG--
branch : product-engine
2009-12-26 13:25:22 +02:00
Alexei Arabadji 5e2d18037d EXT-700 “"Offer" notifications should be accessible via chiclet”
made teleport offers not spawn chiclet;

--HG--
branch : product-engine
2009-12-26 12:21:45 +02:00
Alexei Arabadji 19faceabf4 EXT-700 “"Offer" notifications should be accessible via chiclet”
made 'inventory declined' notification spawn chiclet;
made 'inventory declined' toast as notytip;

--HG--
branch : product-engine
2009-12-25 17:11:28 +02:00
Alexei Arabadji 40d89ae418 fixed EXT-700 “"Offer" notifications should be accessible via chiclet”
made inventory and teleport offers spawn chiclet;
made 'inventory accepted' toast as notytip;

--HG--
branch : product-engine
2009-12-25 16:41:06 +02:00
Alexei Arabadji e9afce6786 mplemented EXT-2801 “Record "object return" notification into IM history, not
chat history”,
added logging to IM for ServerObjectMessage notification;

--HG--
branch : product-engine
2009-12-10 12:36:28 +02:00