a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
b4796595f2
Automated merge with http://hg.secondlife.com/viewer-release
2014-05-06 16:03:07 -04:00
ba892274b3
DRTVWR-363: Fix LLNotificationsListener::listChannels() channel walk.
...
LLNotifications::ChannelMap went away when LLNotificationChannel became an
LLInstanceTracker subclass. Iterate the universe of channels using
LLNotificationChannel::beginInstances(), endInstances() instead.
More troubling is that LLNotificationChannel::getParentChannelName() went away
too. When LLNotificationChannel acquired a Params block and corresponding
constructor, it acquired the ability to listen on multiple upstream sources.
That meant that a single mParent string became inapplicable, and its access
method was removed. (Curiously, mParent was not itself removed, but it was
left unused.) Change mParent to mParents, a vector<string>, built by
connectToChannel(). Introduce getParents(), an accessor returning an
iterator_range over that vector.
Change LLNotificationsListener::listChannels() to collect a "parents" key in
the map returned for each channel, and -- for backwards compatibility --
capture the first entry in the "parents" array as "parent".
2014-03-28 10:30:03 -04:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
ac7a978f27
Disable notifications test API support
2014-02-18 23:31:29 +01:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
7ca10e5161
merge changes for 3.6.4-release
2013-08-26 15:14:12 -04:00
19726783cd
MAINT-3046 make LLNotifications clear out vecs of LLNotificationChannelPtr so singleton cleanup doesn't do things it really ought not do
2013-08-23 14:44:46 -07: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
d2386652f8
CHOP-962: Make LLControlVariable::setPersist() accept only enum.
...
Initial change made LLControlVariable::mPersist an enum, but retained
bool/BOOL public API. setPersist(true) set one value, setPersist(false) set
another, forcePersist() set the third. Per code review, expose enum to public,
make setPersist() (and LLControlVariable constructor, and LLControlGroup::
declareControl(), and all the LLControlGroup::declareMumble() methods, and all
the unit-test dummy declareMumble() method bodies) accept that enum. Remove
forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly.
Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-07-25 16:46:51 -04:00
24db277777
Restore VITA LLNotiication API
2013-07-25 16:11:26 -04:00
8554eb5fcd
SH-4242 FIX interesting: Mac viewer crashes on exit
...
made notifications subsystem touch instancetracker<notificationchannel>
in constructor so that teardown order is preserved
2013-06-24 15:01:16 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
68f9f656cd
merge with viewer-release
2013-03-22 00:44:59 -07:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
86905e89e9
Crash prevention, don't dereference possible 0-pointer.
2013-11-12 10:58:30 +01:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
4dccf30bf3
merge changes for 3.6.7-release
2013-10-03 18:04:27 -04:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
b7f4916b3e
CHUI-679 FIX Crash when script floater appears in CHUI viewer
...
LLPostponedNotification now inherits from LLMortician so it can postpone its deletion. This prevents a crash when looking up an avatar name in the case where the name already exists in the cache.
2013-01-15 02:48:52 +00:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
a9ffc0120a
Merged with default tip (Revision 13149a524874)
...
--HG--
branch : RLVa
2013-05-06 23:54:58 +02:00
4101c43f5f
Merged with viewer-sunshine tip (Revision 87a6fc812214)
...
--HG--
branch : RLVa
2013-02-20 19:25:10 +01:00
e1b955226d
Merged with viewer-sunshine tip (Revision bd1162cb6fbe)
...
--HG--
branch : RLVa
2013-02-11 23:04:05 +01:00
b5172de28f
CHUI-660: Post code review changes
2013-01-08 17:06:49 -08:00
974720373d
CHUI-660: Problem: Upon auto-existing DND mode upon startup, the notification form elements (buttonts) were added to the form. But then deserialized form elements were also being added to the form causing duplicate buttons. As a solution, only add on the deserialized form elements that exceed the amount in the template.
2013-01-08 12:21:47 -08:00
613b7a45a7
Merge with viewer-chui
2013-01-04 21:33:07 -08:00
fbc414c02b
Merge with viewer-chui
2013-01-04 20:28:01 -08:00
02ca16c133
CHUI-499: Now when existing DND mode, stored IM's will not show a toast but instead flash the conversation line item and Chat FUI button.
2013-01-04 17:58:30 -08:00
aa6fee292d
CHUI-499: Fixed a serialization problem where the a notification's objectInfo was not being serialized/deserialized.
2013-01-03 14:19:04 -08:00
c2d332a89c
CHUI-580 : WIP : Added disconnect of callbacks once they're called to prevent filling up the callback queue
2012-12-17 20:16:33 -08:00
6fe7144104
CHUI-580 : WIP : Protect callback connections passed to LLAvatarNameCache::get() where necessary
2012-12-17 18:59:01 -08:00
c73947ac1f
CHUI-499: Adding ability to serialize the communication notifications to local disk per user.
2012-12-18 18:48:15 -08:00
54380ed6d7
Pull and merge ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
2012-12-05 11:23:37 -08:00
fc000880b4
CHUI-519 FIXED Do not put offered items into the trash while in Busy / DND mode
2012-12-05 20:47:21 +02:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
60c72c85e2
Cleaning up some unreferenced member variables and related types from LLNotifications.
2012-12-03 19:06:52 -08:00
67bc42a80a
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-20 16:20:40 -08:00
c0224cc47a
merge with viewer-development
2012-11-19 19:06:36 -08:00
987350fcb3
CHUI-489: Code review cleanup for both CHUI-489 and CHUI-486. This should be last commit for CHUI-489.
2012-11-15 19:24:45 -08:00
d3474c6eaf
CHUI-489: Now sounds exist for teleport and inventory offers. The sound is specified in notifications.xml. Also changes for CHUI 486, which allow the user to set preferences for hearing sounds for a New Conversation, Incoming Voice Call, Teleport Offer and Inventory Offer.
2012-11-15 15:42:22 -08:00
ed17c181dd
SH-3499 WIP Ensure asset stats output is correct
...
further fixes to implicit conversion of unit types
2012-11-07 15:32:12 -08:00
6e2b3527cc
CHUI-475: Ensuring that objects that query the avatar name cache with a callback store the connection and disconnect on object destruction. This should help resolve some of the heap corruption we are seeing.
2012-11-02 13:22:48 -07:00
Ansariel