Commit Graph

69 Commits (906dea62dc3f797770f3a7a879bb996d24e2e83b)

Author SHA1 Message Date
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
Leyla Farazha 0207d7e9e4 EXP-1247 Nearby chat as part of chat floater 2011-09-27 15:41:06 -07: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
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 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
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
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