21c8dea4e4
Test merge
2010-10-04 17:40:59 -07:00
a82a270b80
More precise control of notifications using notification_visibility.xml.
...
Added a "name" property that lets a rule match a specific notification.
Added a "response" property that lets a rule specify a response when it matches.
Reviewed by Richard.
2010-10-01 17:43:27 -07:00
d3422c8d9e
Merge
2010-10-12 15:52:03 -07:00
7ffc9b06c8
Created a floater for setting display name
2010-10-08 16:56:02 -07:00
2b6d3b851f
Adding tags mechanism to notification visibility rules.
...
Also started adding the tag 'fail' to entries in notifications.xml that are failures the user should always be told about.
Reviewed by Richard.
2010-09-30 14:48:36 -07:00
cd2b9b45fa
Cancel hidden notifications instead of using empty responses.
...
This is more work on EXP-111.
Reviewed by Richard.
2010-09-30 12:18:49 -07:00
27f6b2ea7d
Change non-visible notifications to return empty response instead of default.
...
This is part of EXP-111.
Reviewed by Richard.
2010-09-29 16:51:21 -07:00
97f11e0e39
added max_length_chars to notification params
2010-09-29 10:56:47 -07:00
b2ebf4c245
Add XML validation in LLNotifications when loading notifications.xml and notification_visibility.xml.
...
Reviewed by Richard.
2010-09-28 17:10:40 -07:00
ff071bbdce
Added a mechanism for preventing classes of notifications from being displayed, controlled by the notification_visibility.xml file in the viewer skin.
...
Reviewed by Richard.
2010-09-28 16:49:22 -07:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
ad440a68bb
merge
2010-09-27 09:46:20 -07:00
d3a9d6a6ce
trivial indentation changes while I'm poking around here.
...
(transplanted from 01d8534678f5613c924a036128addf6b7447c92a)
2010-09-24 15:44:26 +01:00
636c86782b
cleaned up notifications.xml and made global notifications toggle not use or modify saved responses
2010-09-22 16:12:04 -07:00
0edb695ea8
instead of exposing mutable container in LLInitParam::Multiple, just expose access functions, begin(), end(), etc.
...
this allows mutation of param block contents, without being able to change number of elements
2010-09-22 14:48:18 -07:00
325f16d0b4
fix for mac build and possible crash when responding to notification twice
2010-09-21 14:28:03 -07:00
a748466377
EXP-82 FIX MOTD open in external browser notification not given until fully logged in
...
reviewed by Monroe
2010-09-20 19:16:17 -07:00
8e09bcd703
fix for clicking on Invite Friends resulting in disabling popups
2010-09-17 17:28:22 -07:00
2dc14c66d4
fix for all notifications being ignored by default
2010-09-16 17:55:28 -07:00
b24071ca89
added ability to have notification ignore variable point to settings.xml variables
2010-09-16 16:28:57 -07:00
f87a49991a
refactored notification template into own header file
2010-09-16 00:39:21 -07:00
e0548d4c6f
finished notifications param block parsing logic
2010-09-14 20:11:58 -07:00
1ad5663463
converted notifications.xml to paramblock parsing for easier reuse and extension
2010-09-14 10:53:05 -07: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
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
3aa8148ed9
fix for occasional crash when dismissing hint
2010-08-18 12:16:29 -07:00
94e406157d
added ability to cancel all notifications with a given name
2010-08-16 14:59:29 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
6f256e2d57
Merge with dessie/viewer-release
2010-08-04 15:44:45 -07:00
6a1fefac22
Redo the same merge as in changeset "2026f824953f", but this time with feeeeling.
2010-08-02 16:59:20 -07:00
854e6acb42
Merge with dessie/viewer-release
2010-07-30 18:07:35 -07:00
19c0d6d4ea
Merge from q/viewer-release to dessie/viewer-release for 2.1.1 beta 1
2010-07-30 10:11:55 -04:00
17bf41415b
merge fix
2010-07-27 16:35:37 -07:00
15247f0869
Backed out changeset: 58571b4e704b
2010-07-27 14:22:14 -07:00
0e06dc8964
Merge from dessie/viewer-release
2010-07-27 14:13:07 -07:00
d603085c03
Merge with dessie/viewer-release
2010-07-19 17:22:12 -07:00
5d85dad85f
Reverted changeset 2bb10eae42bf
2010-07-15 12:31:08 -07:00
200ad6dca7
EXT-8303 FIXED [crashhunters] Crash in inventory_offer_mute_callback
...
Details:
Instead of copying shared pointer, raw pointer was used, that cause crash, since notification responder object was accessed after it was destroyed.
Replaced usage copying of raw pointer instead of copying shared pointer of notification responder object, that should live after notification destroyed.
--HG--
branch : product-engine
2010-07-15 18:57:01 +03:00
c73dcb0a2d
EXT-8341 FIXED Avoided assertion on receiving object auto return notification.
...
Details:
1 Provided passing necessary is_group parameter to LLPostponedNotification::add<LLPostponedServerObjectNotification> method call;
3 Corrected handling group name in LLPostponedNotification::onCachedNameReceived;
2 Added check on retrieved name from cache name and replacement with fallback value.
reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/743/
--HG--
branch : product-engine
2010-07-13 19:42:31 +03:00
33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
5d743c3c58
EXT-8172 FIX notification of missing media plugins causes an infinite loop
...
reviewed by Nyx
2010-06-30 13:15:33 -07:00
77e6fcd423
DEV-50013 WIP gCacheName->getGroup() to distinguish from av lookups
...
Helps with global finds looking for remaining calls to patch.
Reviewed with Leyla.
2010-05-25 11:39:06 -07:00
934dc6e2d0
DEV-50013 Inventory offer notifications use new name system
...
Reviewed with Richard
2010-05-24 16:59:05 -07:00
e2deaf5a14
Clean up merge about name cache callback prototype
2010-05-11 17:26:55 -07:00
a4e20e9932
Implemented EXT-6783(normal sub task) - Implement saving of unread notifications.
...
Utilized old save and load notification code.
Main concern was with notifications that have complex responder - UserGiveItem, ObjectGiveItem. Those responders are object with own fields that need to persist through sessions.
Notifications that should be saved are marked with persist="true" in notifications.xml
Notifications using functor responders are saved automatically.
Notifications using object responders need additional tuning. Responder object should be a) serializable(implement LLNotificationResponderInterface), b) registered with LLResponderRegistry.
At this point following notifications persist through sessions: UserGiveItem, ObjectGiveItem, TeleportOffered, FrienshipOffered.
Reviewed by Mike Antipov - https://codereview.productengine.com/secondlife/r/211/
--HG--
branch : notifications
2010-04-21 14:29:31 +03: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
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
97dea26dfc
Updated normal task EXT-5905 - Resolving offers.
...
Implemented requested feature - "Resolving offer in the notification toast shouldn't remove offer panel form IM log until IM session is restarted"
--HG--
branch : product-engine
2010-03-16 15:30:01 +02:00
fee3752311
Implemented normal task EXT-5905 - Resolving offers.
...
Added functionality to make Toasts accept multiple user inputs(clicks on option buttons).
--HG--
branch : product-engine
2010-03-15 18:06:04 +02:00
68401771cd
CID-325
...
Checker: UNINIT_CTOR
Function: LLNotificationForm::LLNotificationForm(const LLSD &)
File: /indra/llui/llnotifications.cpp
2010-01-29 14:53:16 -08:00
97e59b20f0
CID-340
...
Checker: UNINIT_CTOR
Function: LLNotificationTemplate::LLNotificationTemplate()
File: /indra/llui/llnotifications.cpp
2010-01-29 14:10:29 -08:00
599e96f328
CID-102
...
Checker: INVALIDATE_ITERATOR
Function: LLNotifications::getChannel(const std::basic_string<char, std::char_traits<char>, std::allocator<char>>&)
File: /indra/llui/llnotifications.cpp
not a bug.
2010-01-27 13:11:02 -08:00
f496c2b164
DEV-43622 : API change (no functionality change) to fix a design error in LLSD
...
I made it about a year and a half ago; Zero found it while reading code. I had added a return value to LLSD::insert(), but a) did it wrong, and b) broke the STL-like semantics of insert(). So I've put insert() back to returning void and created LLSD::with(), which does what my earlier insert() did. The compiler then caught all the cases where insert()'s return value were being used, and I changed those to use with() instead.
2009-12-01 20:59:08 -05:00
cbc0783cd1
Created lightweight LLNotificationsUtil::add(), switched most alerts to use it
...
Cuts number of includes of llnotifications.h from 300+ to 40.
2009-11-25 01:15:50 -08:00
668ba958c7
Disabled saving notifications to disk because the load code hasn't worked for months, it spams the logs, and it hits the disk.
...
Discussed with Q, the author.
2009-11-09 15:59:53 -08:00
642d368ecc
merge
2009-10-21 18:49:19 -07:00
fdc848cf72
removed unnecessary static variable instantiations to improve compile times
...
moved a bunch of template class statics to cpp files
also added filename parameter to LLXUIParser::readXUI for better debugging of XUI errors
reviewed by James
2009-10-20 22:05:00 +00:00
4d53e235c2
merge of latest viewer/viewer-20
2009-10-02 10:35:42 -07:00
606b381c9f
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3
...
JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180
* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator
QA NOTES:
* Message Well Window is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed
2009-09-29 19:37:05 +00:00
a7efd0d8dd
Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups.
2009-07-30 19:39:08 -07:00
e97f7728a9
merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-30 23:22:41 +00:00
8f7ec64899
Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window for now, not complete.
...
Merging revisions 127913-128319 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-17 into D:\viewer-2.0.0-3, respecting ancestry
2009-07-27 17:56:26 +00:00
429bd9b55c
Added LLNotificationsListener to hook LLNotifications to the event system according to https://wiki.lindenlab.com/wiki/Incremental_Viewer_Automation/Event_API
...
reviewed by palmer.
2009-07-08 12:07:31 -07:00
e2655d4c4b
DEV-34569
...
new --nonotifications command line option for automated testing
Reviewed by Q
2009-06-26 12:17:35 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
087bd26553
Merge of QAR-1383 event-system-7 into trunk.
...
svn merge -r 121797:121853 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge-event-system-7
2009-06-04 16:24:21 +00:00
9dfe0ca9a0
svn merge -r121194:121210
...
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.onetwo-merge-1
QAR-1531 viewer 1.23rc1+1.23rc2 merge to trunk
2009-05-22 09:58:47 +00:00
cc92525b0d
QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3
...
svn merge -r118927:118939
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.0-merge-2-combo-QAR-1476
this is a composite of...
svn merge -r115088:118182
svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-23
conflicts resolved:
C doc/contributions.txt
C indra/llaudio/audioengine.cpp
C indra/newview/CMakeLists.txt
C indra/newview/llfloaterlandholdings.cpp
C indra/newview/llpaneldirbrowser.cpp
C indra/newview/llpanelgrouplandmoney.cpp
C indra/newview/llpreviewscript.cpp
C indra/newview/llviewermenu.cpp
C indra/newview/skins/default/xui/en-us/notifications.xml
and...
svn merge -r116937:118673
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
minor-to-trivial conflicts resolved:
C indra/llcommon/llversionserver.h
C indra/newsim/llrezdata.cpp
C indra/newsim/llstate.cpp
C indra/upgrade/schema_version/sequence/3/index_log_paypal.sql
2009-05-04 17:43:26 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
667ca55bad
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
2009-01-05 18:59:12 +00:00
callum