Commit Graph

17 Commits (6ed99747750685c8a34d595a0c516bbeeeed4299)

Author SHA1 Message Date
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 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
Andrey Lihatskiy 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03:00
Andrey Lihatskiy 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
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Andrey Kleshchev d00b6e4216 SL-15039 Prune unused preferences #1
List of removed preferences (usused per statistics):
AdvanceOutfitSnapshot
AnimationDebug
AskedAboutCrashReports
AudioLevelDoppler
AudioLevelRolloff
AudioLevelUnderwaterRolloff
AudioLevelWind
AutoAcceptNewInventory
AutoLoadWebProfiles
AvatarBacklight
AvatarPickerSortOrder
AvatarPosFinalOffset
AvatarBakedTextureUploadTimeout
AvatarBakedLocalTextureUpdateTimeout
AnimatedObjectsIgnoreLimits
AnimatedObjectsGlobalScale
AvatarBoundingBoxComplexity
StartUpChannelUUID
NearByChatChannelUUID
NotificationChannelUUID
AlertChannelUUID
AssetStorageLogFrequency
AvatarInspectorTooltipDelay
AllowBottomTrayButtonReordering
AvatarRotateThresholdSlow
AvatarRotateThresholdFast
2023-09-22 19:28:23 +03:00
andreykproductengine dc0bd05717 SL-927 Add new groups caps to viewer (offline messages only) 2018-06-26 14:47:30 +03:00
Mnikolenko ProductEngine f5f042de00 MAINT-5427 Group notices and invitation will expand on left-clicking 2015-09-15 16:43:32 +03:00
pavelkproductengine 5665c5320c MAINT-5394 [Project Notice] The PERMISSION_DEBIT notification is not distinct enough on the Project Notice viewer. 2015-07-31 17:49:45 +03:00
Mnikolenko ProductEngine 33c5a3974c MAINT-5369 FIXED Unable to accept group invite using Notification floater 2015-07-13 17:52:42 +03:00
pavelkproductengine f479235aaa MAINT-4734 (Separate transaction notices from group notice/invites)
1) disabled popup show (toast) when clicking on notification in expanded view;
2) made attachment in Group Notice notification clickable (copied logic from LLToastGroupNotifyPanel);
3) removed border around notification text in expanded view and made lighter background;
4) removed border around attachment field in expanded notification view.
2015-05-19 13:20:46 +03:00
pavelk_productengine 60d28437e6 MAINT-4734 (Separate transaction notices from group notice/invites)
1) added GroupNotice notification type and tab "Group" for it;
 2) added Attachment field to group notice notifications which may contain inventory offers, notecards,  etc;
 3) added Fee field to Group Invite notifications;
 4) added notification resize depending on attachment field.
2015-04-08 19:51:39 +03:00
pavelk_productengine 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
pavelk_productengine 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
pavelkproductengine 23ae6d098a MAINT-4734 (Separate transaction notices from group notice/invites) - fixed Mac build 2015-01-12 18:25:28 +02:00
pavelk_productengine 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