a9c29b4b81
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llmenugl.h
# indra/llui/lltexteditor.cpp
# indra/newview/llfloaterbump.cpp
# indra/newview/llfloaterbump.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llnetmap.cpp
2022-10-20 10:51:25 +02:00
5456af4c8c
Fix various menu leaks and lazy creation in chiclets, bump floater, media controls, and the mini map
2022-10-19 16:28:34 -04:00
b5635da9e9
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-09-23 10:08:11 +02:00
825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
64f80748e7
Merge branch 'DRTVWR-507-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-18 21:50:17 +02:00
9751942372
Small Cleanup
2020-05-18 18:33:08 +03:00
6afd505fa8
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-05-05 15:24:10 +02:00
b576e832d7
SL-3475 Add 'Close All Dialogs' option for Script dialogs
2020-03-23 16:59:22 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
d7282efb6f
FIRE-17318: Add option to use legacy notification well window (simple list view)
2015-11-19 21:32:47 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
96bd958465
Merge recent changes from Firestorm LGPL
2015-10-27 20:06:54 +01:00
524e7cc347
Make unread IM counter in application window title optional
2015-10-20 09:52:16 +02:00
214414fe28
Unread IMs counter in window title
2015-10-20 01:00:05 +02:00
0e0795b602
Merge viewer-notice
2015-10-05 13:08:48 +02:00
79295f6a34
FIRE-2778: Allow re-arranging IM tabs; by Kitty Barnett (Catznip Viewer), with modifications for Firestorm
2015-07-13 16:08:57 +02:00
9a93bb1861
merge changes for MAINT-4734
2015-05-18 21:08:22 +03:00
b147d659dc
MAINT-4734 (Separate transaction notices from group notice/invites)
...
1) stripped off attachment field;
2) made logos (group's, sender's, etc) in expanded view the same size as in condensed view;
3) turned on notification showing upon click;
4) fixed cropped right border of Invite and Transactions notifications;
5) enabled "Collapse All" button;
6) stripped off unnecessary icons.
2015-03-17 18:26:28 +02:00
9be423524d
Merge LL V3.7.27
2015-04-14 22:08:31 +02:00
b31631934a
MAINT-4734 (Separate transaction notices from group notice/invites)
...
- added code to sort notifications between tabs: Invites, Transactions, System messages
- made cosmetic changes according to comment from 27/Jan/15 in Jira
- added code to show correct number of notifications on each tab
- added code to close all notifications on current tab via "Delete all" button
2015-02-03 19:44:25 +02:00
e5d6a14f05
MAINT-4734 (Separate transaction notices from group notice/invites) - initial version
...
Works:
1) All new notices shown on "Invites" tab of new floater "NOTIFICATIONS TABBED" in condensed view
To be done:
1) Show other types of notices, like transactions and system
2) Separate notices between tabs "Invites", "System", "Transactions"
3) Design full notice view (in addition to condensed view)
2015-01-09 20:17:39 +02:00
a555f635da
MAINT-729 FIXED Hide popup menu (which belongs to old chiclet) when new chiclet arrives.
2015-01-06 18:20:42 +02:00
4072343e33
!s_previous_active_voice_session_id.isNull() -> s_previous_active_voice_session_id.notNull()
2015-03-04 14:03:24 +01:00
1e297175ce
Fix voice volume inspect being empty if opened via click on the chiclet output monitor control
2015-03-04 13:57:41 +01:00
bc473a0548
FIRE-11724: Add option to snooze a group chat session; Original code by Kitty Barnett (Catznip viewer), with special modifications for Firestorm
2015-02-06 17:49:24 +01:00
f4bfb1aadf
Merge LL V3.7.9 (AIS3 + SSA)
2014-10-22 02:02:08 +02:00
001621dfc2
MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null.
2014-05-05 23:24:34 +01:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
fe518bde8e
merge with release
2013-11-06 17:22:04 -08: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
4faad350c7
Improve envelope notification behavior when there is no toast to display
2013-07-24 12:34:32 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
0f24668b0a
Merged in Chui beta6+ fixes
2013-03-29 10:37:58 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
e59333f8dd
CHUI-894 FIXED Call closeAll() for LLIMWellWindow to clear object notifications.
2013-03-27 20:06:32 +02:00
f2948cb1eb
Merge with viewer-chui
2013-03-20 17:53:51 -05:00
c294c7c474
CHUI-863 : Clean up dead code that's creating failures on gcc-4.6 builds on Linux
2013-03-16 16:09:50 -07:00
9150757c81
More fixes for gcc-4.6 breakage
2013-03-13 21:01:50 +00:00
e41ca4b4b8
merge RLVa update
2013-11-11 00:40:45 -08:00
fd7e737a9b
Merged with default tip (Revision 4798c4f76be3)
...
--HG--
branch : RLVa
2013-11-06 13:46:33 +00:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
7ab9a75da4
Cleanup llchiclet.cpp from stuff we don't need anymore
2013-08-05 14:38:16 +02:00
9e9b3938ce
FIRE-11172 / FIRE-11222 / FS communication UI:
...
* Re-add IM/group/adhoc chiclets
* Re-add IM well chiclet
* Re-enable stand-alone IM floaters
2013-08-05 14:35:28 +02:00
10a289598b
Merged with default tip (Revision 74cc289067c8)
...
--HG--
branch : RLVa
2013-07-21 22:33:04 +02:00
7d012cb35e
- fixed : teleport and friendship offers don't increment the notificaiton systwell counter and can't be dismissed
...
--HG--
branch : RLVa
2013-05-10 13:31:10 +02:00
75e6255acf
Honor show_toast in notifications, miscellaneous clean up of llviewermessage.cpp ;;'s
2013-07-24 14:28:55 -06: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
64b001cda3
Fix some more CHUI merge issues including old merge bug in llavatarlist.cpp
2013-07-08 14:19:57 +02:00
Ansariel