cb43c1c792
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
2024-07-10 12:36:15 +02:00
2a7030992f
Update tracy profiler to 0.10 ( #1946 )
2024-07-09 16:53:43 -05:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
48d2534cef
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llchannelmanager.cpp
# indra/newview/llcompilequeue.cpp
# indra/newview/lldrawpoolground.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
2023-09-27 20:16:00 +02:00
d0d05ddddf
SL-15039 Prune unused preferences #4
2023-09-27 13:11:12 +03:00
ef88337eef
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/cmake/GLOD.cmake
# indra/llcommon/tests/llprocess_test.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llmodelpreview.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
6ecf8f2c01
SL-16184 FIXED Frame stall when friend comes online.
2021-10-20 14:53:55 +03:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
9a1688322a
SL-15195 The notification in chat history is multiplied after relogging
2021-05-13 17:51:24 +03:00
91e24a80ec
[FIXED] llTextBox can be used to bypass @sendchat and @sendchannel (leave @sendchannel as-is for now)
...
-> Reported by Chorazin Allen
2021-02-14 21:41:16 +01:00
ba90f3a8e4
SL-10994 Removed Facebook In-world Sharing
...
SL-11024 Fixed Twitter connect failure
2019-04-24 02:24:42 +03:00
561cee12d8
MAINT-2585 Make permission request notifications permanent until action taken
2017-05-25 16:51:45 +03:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
6e74c0de6a
Streamlined previous fix for ACME-1471
2014-05-29 03:53:43 +01:00
e143ceb9db
Added inelegant fix for ACME-1471 to pop up the old notification with each new notification
2014-05-29 03:04:19 +01:00
f06b305d9f
ACME-1471 WIP [VWR] Merge multiple Exp Perm dialogs into one
...
merged multiple experience toasts into a single one
reviewed by Cho
2014-05-28 16:16:09 -07:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
cc18896faf
STORM-1951: Only toast when we should, honor show_toast notification param
2013-07-15 14:24:29 -06:00
54e879cc22
added Facebook status update feature for ACME-502, ACME-503, and ACME-504
2013-06-08 00:48:46 +01:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
7705b43889
CHUI-691: Now when an estate message is received while in DND mode, a toast notification will appear.
2013-02-01 18:04:33 -08:00
dde030e6cd
CHUI-689: When DND mode is enabled, making a direct delivery purchase results in an IM message from '(Nobody)'. Solution: Fixed a problem in process_improved_im that would falsy use system messages while in DND mode as an IM from a user. Also made it so that while in DND mode, SystemMessages and message with a high or greater priority are shown to the user as toasts (before a notification chiclet would just appear without the toast).
2013-02-01 11:18:23 -08:00
9da625d439
CHUI-494: WIP First pass at getting the suppression of events in DND working.
2012-12-06 20:28:25 -08:00
a3b36bad82
CHUI-309 FIXED Use onRemoveNotification only for "LoadWebPage", "ScriptDialog" and "ScriptDialogGroup" notifications
2012-09-24 15:33:59 +03:00
8922dec400
CHUI-293 CHUI-294 FIXED displaying Group Invite and Transfer Object as notifications, instead of displaying as messages from an object.
...
Restored the exception in handling "LoadWebPage", "ScriptDialog" and "ScriptDialogGroup" notifications, that caused only those notifications to be shown as messages from an object.
2012-08-21 19:51:41 +03:00
3e038cd71b
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-27 12:53:54 -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
f4edcdd409
MAINT-938 FIXED (Make debit-permissions dialog give a stronger warning)
...
- Added new tag called "footer" to the notification. This tag allows to display messages under the buttons in toasts.
- Created new class LLToastScriptQuestion for the "ScriptQuestionCaution" notification. This notification supports tag <footer>.
2012-05-17 21:02:53 +03: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
ee048db209
removed source of notification spam for duplication-suppressed notifications
2011-03-14 12:39:56 -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
949b604655
Backed out changeset: d71309f8bd0e
2010-09-17 15:01:44 -07:00
83bb4b9518
fixed merge
2010-09-16 22:10:30 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
0c828289c0
renamed LLHandlerUtil::logToIM to LLHandlerUtil::logToIMP2P;
...
avoided IM-toast popup when adding message to session;
--HG--
branch : product-engine
2009-11-30 18:15:09 +02:00
f0426b924f
implemented EXT-2889 "Incoming "grant modify rights" message should trigger
...
notify toast and adding record to IM history";
fixed avatar icon in IM-floater when message added to IM-session;
avoided popup of IM-tast when message added to IM-session;
--HG--
branch : product-engine
2009-11-28 17:43:21 +02:00
3710517829
Partial implementation of a normal task EXT-2471 llLoadURL should be handled also by Chiclet subsystem along with Notificaton subsystem:
...
- implemented normal subtask EXT-2472 Implement a chiclet for the llLoadURL() processing
- implemented normal subtask EXT-2474 Implement a chiclet window for the llLoadURL() processing
--HG--
branch : product-engine
2009-11-27 16:31:09 +02:00
0e351bedb6
Removed llnotifications.h from all headers by adding llnotificationsptr.h
...
Fixed many more includes
2009-11-24 22:55:56 -08:00
9f0dbcf4c0
Update for task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
...
Cleaned code, added comments.
--HG--
branch : product-engine
2009-11-23 15:50:49 +02:00
d0c1593d85
Merge
...
--HG--
branch : product-engine
2009-11-20 19:24:07 +02:00
9d64bf132e
Update for normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
...
Fixed function names.
--HG--
branch : product-engine
2009-11-20 19:23:22 +02:00
13a6077b78
Implemented normal task EXT-2081 - Object IM chiclets art needs to be hooked up to LLDialog chiclets.
...
Implemented LLDialog(LLScriptFloater) and Script Chiclets.
--HG--
branch : product-engine
2009-11-20 19:17:38 +02:00
b38ca5ec32
fix for UI scale != 1.0 breaking edit tools, web browser, world view rect, etc.
2009-11-16 15:47:45 -08:00
Ansariel