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
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
2cb09dd4a8
SL-16024: Return shared_ptr from LLInstanceTracker::getInstance().
...
It feels wrong to return a dumb LLInstanceTracker subclass* from getInstance()
when we use std::shared_ptr and std::weak_ptr internally. But tweak consumers
to use 'auto' or LLInstanceTracker::ptr_t in case we later revisit this
decision.
We did add a couple get() calls where it's important to obtain a dumb pointer.
2021-10-07 11:53:45 -04:00
ae93dd240d
Revert "FIRE-11339: Persisted group notifications get logged to IM on each login"
...
This reverts commit 5609fdbf3d
2021-08-24 10:54:16 +02:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
8b5fe507a4
Merge branch 'master' into DRTVWR-530-maint
2021-06-25 01:02:15 +03:00
9a1688322a
SL-15195 The notification in chat history is multiplied after relogging
2021-05-13 17:51:24 +03:00
7735905d18
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-11-12 17:56:43 +01:00
5609fdbf3d
FIRE-11339: Persisted group notifications get logged to IM on each login
2020-10-29 17:46:28 +01:00
4e43097c77
Merge branch 'master' into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/llfloaterbuycurrency.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.h
# indra/newview/skins/default/xui/en/floater_buy_currency.xml
2020-09-28 22:33:51 +03:00
b677e01629
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2020-09-23 19:02:19 +02:00
2c0814b00a
SL-13335 Friendlier L$ Buy flow when no payment method on file
2020-09-23 11:43:53 +03:00
fe10f171d3
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llpanelmaininventory.cpp
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
# indra/newview/skins/default/xui/en/strings.xml
2020-09-09 19:34:33 +02:00
1cd65a2447
SL-13498 Crash at ~LLPersistentNotificationChannel
...
Callstack is clearly broken since it points to LLNotifications::instance().clear(); after 'Goodbye!', my suspicion is that something reinitialized singleton so I fixed cleanup and added some logging to see if there is a dupplicate init
2020-08-25 22:22:12 +03:00
0f4933e2fc
FIRE-29943: Fix item shared messaged logging to wrong IM logfile if user is offline
2020-07-31 14:03:04 +02:00
56056aa198
Upstream merge from viewer-neko
2019-11-27 23:20:03 +02:00
fd4b8a7bb1
Merge Firestorm LGPL
2019-11-12 18:45:02 +01:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
438bb8c113
Merge viewer-neko
2019-09-10 20:03:09 +02:00
e29b3605c3
SL-11315 Viewer asks to play media and retains selected choice
2019-09-05 17:15:57 +03:00
c61d0f4297
DRTVWR-493 LLUI to LLParamSingleton
2019-08-10 15:31:03 +03:00
9f099336e7
Merge viewer-lynx
2017-08-04 18:28:07 +02:00
dcb6a850aa
MAINT-7356 Improved the notification appearance
2017-07-25 03:18:59 +03:00
2efa40fa60
MAINT-7356 Logic fix and cleanup
2017-07-21 05:29:51 +03:00
2347b25808
Merge viewer-neko
2017-06-09 11:49:10 +02:00
d7edeb2df8
STORM-2149: Add a warning notification when deleting a folder of filtered content
2017-06-02 16:44:00 +02:00
099d988fe2
Merge viewer-neko
2017-05-25 22:49:53 +02:00
561cee12d8
MAINT-2585 Make permission request notifications permanent until action taken
2017-05-25 16:51:45 +03:00
dcac0dce59
Merge viewer-bear
2017-05-07 13:11:50 +02:00
0dcb423cf3
MAINT-7145 Eliminate LLSingleton circular references
2017-04-25 17:48:34 +03:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
1bba3dfbe4
Merge viewer-bear
2016-03-17 21:14:49 +01:00
230fc28d8a
MAINT-6097 FIXED On required update, clicking link to release notes opens browser behind menu
2016-03-11 20:16:03 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
5f7b0c5a59
Merge viewer-bear
2016-01-13 12:34:02 +01:00
30446d6afc
MAINT-6018 Open URL dialog spam
...
Added the ability to close all notifications from one owner at once
2016-01-11 03:24:36 +02:00
29cb3a4a93
MAINT-6018 Open URL dialog spam
...
Added the ability to close all notifications from one owner at once
2016-01-11 03:24:36 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
487fce4afa
Merge with 3.7.11-release
2014-07-09 15:22:12 -07:00
43d12faffe
Added COMBINE_WITH_NEW for notifications for ACME-1471
2014-05-17 04:21:56 +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
Ansariel