0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +02:00
f0e4dcdaf6
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llthread.h
# indra/llmessage/llcachename.cpp
# indra/llui/lllineeditor.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llimprocessing.cpp
# indra/newview/llimview.cpp
# indra/newview/llnotificationhandlerutil.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltextureview.cpp
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexture.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
2024-05-08 05:10:22 +02:00
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +02: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
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
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
240757c0d0
Merge branch 'DRTVWR-515-maint' of https://bitbucket.org/lindenlab/viewer
2020-08-20 16:52:04 +02:00
48a4e9f5ed
SL-13620 FIXED The code appears instead of the maturity icon in the chat history
2020-07-22 19:15:28 +03: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
92f6d8d521
Merge viewer-bear
2016-10-01 17:03:57 +02:00
6e3acac4f0
MAINT-6735 brackets fix
2016-09-20 20:42:57 +03:00
e638f635c8
MAINT-6735 Teleport offer sound does not play when the the destination region's maturity exceeds the current maturity settings
2016-09-20 16:45:42 +03:00
d52a5c73bf
FIRE-19836: Teleport offer doesn't play notification sound anymore; Fix an apparent oversight by LL on the way and play notification sound for maturity exceeded and maturity blocked cases
2016-09-02 09:30:06 +02:00
1c7b227637
Merged with RLVa-refactor tip
2016-06-11 02:36:07 +02:00
75e217b82e
Code review: RLVa extensions are no longer optional features
...
-> @accepttprequest will auto-accept all incoming teleport requests (allows exceptions - see @accepttp)
-> @allowidle (stays experimental - subject to change)
-> @getcommand:<filter> can be used to discover which commands are part of the user's RLVa implementation (with user-defined separator)
-> @findfolders:<filter> works like @findfolder but will return all matches (with user-defined separator)
-> @getdebug:<setting> can be used to query (but not set) the "RestrainedLoveforbidGiveToRLV", "RestrainedLoveNoSetEnv" and "WindLightUseAtmosShaders" debug settings
-> @interact will block world interaction but allows drag-drop, the camera tool, mouse steering and access to the "self" context menu
-> @sharedwear is the counterpart of @unsharedwear and wear locks the shared #RLV folder
-> @sharedunwear is the counterpart of @unsharedunwear and remove locks the shared #RLV folder
-> @touchhud will prevent the user from touching/clicking on their HUD attachments (allows exceptions)
-> @tprequest will prevent the user from requesting teleports (allows exceptions - see @tplure)
-> force wear commands will activate/deactivate gestures as well
-> force wear commands will collect from folder links as well
-> [FIXED] Location on incoming teleport requests isn't censored when @showloc restricted
-> [FIXED] Message on outgoing teleport offers isn't censored when @startim restricted
-> [FIXED] Message on outgoing teleport requests isn't censored when @sendim or @startim restricted
--HG--
branch : RLVa
2016-04-10 14:07:23 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
574e054b09
- internal : reviewed @startim for CHUI (SL-3.5)
...
-> fixed : "Send Instant Message" on a calling card opens an IM session
-> fixed : "Start Conference Chat" on a selection of multiple calling cards opens an IM session
-> fixed : actions that would result in an IM window opening shouldn't be blocked if the session is already open
-> added : RlvActions class to mimick LLAvatarActions and lowering the rlvhandler.h include dependency
--HG--
branch : RLVa
2013-05-09 15:09:03 +02:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
f79f9f111b
CHUI-774 FIXED Play a sound even if the conversation floater is open and conversation with user is the active.
2013-02-21 15:11:32 +02:00
c0433f1460
CHUI-774 Fixed condition of the checking. Also the sound for Teleport offer will be played correctly now.
2013-02-15 13:15:14 +02:00
c418d61627
CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-25 17:47:36 -08:00
7985683413
Connected inventory offer sound with UI Sounds panels
2013-07-11 12:08:45 +02:00
106f97a0c7
Follow up of the previous commit
2013-07-11 11:50:17 +02:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -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
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
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
89f7335a52
CHUI-489: Found a bug in last commit for this issue. The sound notification (for inventory/teleport offer) would be played for the toast popup as well as once the conversations floater was opened. And also when a button was clicked in the conversation floater to 'accept' or 'deny' the offer. Now only playing the sound notification when the initial offer has been made.
2012-11-15 17:34:34 -08: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
28d5727cec
post-merge build fixes
2012-04-26 15:30:08 -07:00
a0bb55adc6
merge with viewer-release
2012-04-26 14:39:52 -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
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
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
Ansariel