6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
19ac039501
FIRE-10940: Added option to suppress group notice text in group chat
...
Also, exposing Kadah's FSBetterGroupNoticesToIMLog in Prefs
2014-01-16 22:48:36 +01:00
40762b7643
MAINT-3110 FIXED new crash in LLNotificationsUI::LLHandlerUtil::logToIMP2P
2013-09-06 20:16:52 +03: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
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
3f481c13b1
Add some includes to get the rest of the viewer to compile
2013-11-11 08:05:53 -08:00
e41ca4b4b8
merge RLVa update
2013-11-11 00:40:45 -08:00
7dd730473b
Merged with default tip (Revision 35f1667645bc)
...
--HG--
branch : RLVa
2013-10-09 22:49:44 +02:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -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
49ad5109ca
Undid outdated chat logs patch from Catznip 2.4 to fix broken chat log filenames and replaced it with stock V3 code plus option to use legacy filenames
2013-07-17 01:47:53 +02:00
8146bbda39
Merge
2013-07-09 16:26:07 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
c0450ad230
More code cleanup
2013-07-08 17:23:17 +02:00
32292a2731
FS communication UI: Re-added code so we don't toast IMs if the corresponding floater is open
2013-06-29 20:26:46 +02:00
ae6d93f759
FS communication UI: Fixing notification handlers
2013-06-29 04:13:30 +02:00
a8cbee6e81
More compile fixes and hooking up of FS communication UI
2013-06-28 23:34:21 +02:00
c61db3d380
Merge LGPL tip
2013-06-26 12:59:37 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
b9028b5a2e
Improved logging of group notices to group IM log
2013-06-06 13:54:16 -07: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
fc9f1252e1
Merge with Firestorm LGPL tip
2013-03-19 09:51:23 +01:00
c201694f26
Don't show RadarAlert or StreamMetadata notifications in nearby chat. If the user elects for that, they can use the default reportToNearbyChat modes
2013-03-16 18:32:35 -06:00
63ef2950e9
CHUI preparation phase 1: Move FS-specific communication parts into a separate domain and out of the way for CHUI merge to reduce conflicts
...
* LLChatHistory moved to FSChatHistory
* LLFloaterNearbyChat moved to FSFloaterNearbyChat
* LLIMFloater moved to FSFloaterIM
* LLIMFloaterContainer moved to FSFloaterIMContainer
* LLNearbyChatbarListener moved to FSNearbyChatbarListener
* LLNearbyChatControl moved to FSNearbyChatControl
* LLNearbyChatHub moved to FSNearbyChatHub
* floater_im_container.xml moved to floater_fs_im_container.xml
* floater_im_session.xml moved to floater_fs_im_session.xml
* floater_nearby_chat.xml moved to floater_fs_nearby_chat.xml
* widget chat_history.xml moved to fs_chat_history
* widget nearby_chat_control.xml moved to fs_nearby_chat_control.xml
2013-02-28 18:57:38 +01:00
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
d5f93071b5
Merge with RLVa tip for viewer-sunshine
2013-02-15 19:26:00 +01:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
9c395aa0c6
Merged with default tip (Revision f958326781de)
...
--HG--
branch : RLVa
2012-07-16 01:01:09 +02:00
68c3d1bb2e
EXP-1953: First pass at implementing the maturity flow during a teleport via lure.
2012-06-08 18:28:19 -07:00
cb24ec2e0d
merge LL 3.3.4 beta
...
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -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
e61c20d499
Merge LL 3.3.1 Viewer Release
2012-04-26 17:31:35 -07:00
362a231df1
Merged with .RLVa tip
...
--HG--
branch : RLVa
2012-05-17 15:33:56 +02:00
906dea62dc
Nearby chat working, toolbar layouts mostly behaving.
2012-01-27 23:29:53 +01:00
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
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
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
Tank_Master