e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.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.cpp
# 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/llimpanel.cpp
# indra/newview/llimpanel.h
# 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/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# 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/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
f9473e8afc
secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries
2024-05-07 10:18:51 +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
d0d05ddddf
SL-15039 Prune unused preferences #4
2023-09-27 13:11:12 +03: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
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
9a1688322a
SL-15195 The notification in chat history is multiplied after relogging
2021-05-13 17:51:24 +03: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
561cee12d8
MAINT-2585 Make permission request notifications permanent until action taken
2017-05-25 16:51:45 +03: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
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05: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
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
c5c72899f3
Fixed normal subtask EXT-6441 - Do not show "friendship accepted" toast if respective IM window is open and in focus.
...
Minor changes to supress toast for FriendshipAccepted notification.
--HG--
branch : product-engine
2010-03-23 10:10:15 +02:00
a2150863f9
Updated normal task EXT-5905 - Resolving offers.
...
Reusable notifications are deleted when user closes IM floater(old - when user closes Viewer).
--HG--
branch : product-engine
2010-03-19 17:18:53 +02:00
e7027a57e1
fixed EXT-5904 “Offers embedding into IM windows”,
...
revised embedding and logging offer notification to provide loading log entry
in case notification doesn't exist;
--HG--
branch : product-engine
2010-03-11 17:53:49 +02:00
2f9cc80c2e
fixed EXT-5910 “Offers logging”,
...
fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;
--HG--
branch : product-engine
2010-03-05 17:53:32 +02:00
462ab1c752
fixed EXT-5908 “Accepted friendship notification shouldn't spawn chiclet”,
...
made not spawn IM chiclet friendship accepted notification;
added friendship accepted notification to syswell chiclet;
--HG--
branch : product-engine
2010-03-05 12:37:06 +02:00
f54bf2a1ea
fixed EXT-5904 “Offers embedding into IM windows”,
...
made all type offers be embedded to the IM floater;
made showing offer toast if IM floater isn't visible;
corrected IM message counter on showing offer toast;
--HG--
branch : product-engine
2010-03-04 11:35:34 +02:00
eec9f20d74
fixed EXT-5006 “One inventory offer cause blinking of both Conversations and
...
Notifications wells”,
embedded inventory offer panel into IM window;
--HG--
branch : product-engine
2010-02-18 16:05:11 +02:00
86609394ca
fixed major EXT-3643 “Embed friendship offer into IM window”;
...
--HG--
branch : product-engine
2010-01-29 17:48:10 +02:00
f9a2b8f9de
Minor spelling issue.
...
--HG--
branch : product-engine
2010-01-05 20:22:50 +02:00
4c4c788728
Fixed normal bug EXT-3643 (Make Friend Offer dialog a modal alert)
...
-- made dialog a modal alert
-- logging to IM is left as it was
--HG--
branch : product-engine
2009-12-26 13:25:22 +02:00
40d89ae418
fixed EXT-700 “"Offer" notifications should be accessible via chiclet”
...
made inventory and teleport offers spawn chiclet;
made 'inventory accepted' toast as notytip;
--HG--
branch : product-engine
2009-12-25 16:41:06 +02:00
0a617f15a8
implemented EXT-2797 “Making friendship offer should be recorded into IM history”
...
--HG--
branch : product-engine
2009-12-07 15:15:41 +02:00
28a1ee9da8
implemented EXT-700 “"Offer" notifications should be accessible via chiclet”
...
--HG--
branch : product-engine
2009-12-04 18:33:13 +02:00
07f284408b
Implemented normal task EXT-2476 (llGiveInventory() should be handled also by Chiclet subsystem along with Notificaton subsystem)
...
--HG--
branch : product-engine
2009-12-01 21:46:19 +02: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
0e351bedb6
Removed llnotifications.h from all headers by adding llnotificationsptr.h
...
Fixed many more includes
2009-11-24 22:55:56 -08:00
5725b04b08
Merge from default branch
...
--HG--
branch : product-engine
2009-11-19 16:14:19 +02:00
Ansariel