4a00280b89
viewer#2411 Use font buffer for inventory
2024-09-07 00:32:18 +03:00
68f712615f
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
...
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
2024-08-20 09:44:14 -07:00
342eee5038
SL-15061 Crash at LLConversationItemSession::clearAndDeparentModels #3
2024-08-20 09:20:52 +03:00
7cc3ff55b9
viewer#2296 Don't show 'are you sure you want to leave the call' when shutting down
2024-08-19 08:12:34 +03:00
cd18835270
Fix nullptr crash in LLFloaterIMContainer::onAddButtonClicked
2024-08-09 22:55:08 +03:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
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
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
85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
84dfe55810
Merge branch 'main' into marchcat/y-merge
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
2024-04-10 07:08:25 +03:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
5aa56bf1a7
Viewer#822 Sort participants by recent activity is not working
2024-02-21 00:34:47 +02:00
ffe0948b4a
DRTVWR-599 OSX buildfix #2
...
remove unused typedef
2024-01-09 21:19:52 +02:00
ba74152c82
Replace BOOST_FOREACH with standard C++ range-based for-loops
2024-01-09 20:44:50 +02:00
d48c77b6dc
SL-20679 fix for "Sort conversations by recent activity" option
2023-12-04 16:22:57 +02:00
d1c0a5b840
Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewergenericmessage.cpp
# indra/newview/llvoavatar.cpp
2023-11-29 10:45:43 +02:00
b6109a0da5
SL-20348 Focus should be in the chat bar when the Conversations floater is opened
2023-10-05 02:21:54 +02:00
e80f0f331d
SL-19986 Crash at LLConversationItemSession::findParticipant
...
Observed on bugsplat, no repro. Something destroys LLConversationItem without cleaning list (some sessions reuse the item, but they aren't supposed to remove it). Either item should inform floater to be properly removed or should be stored as an LLPointer.
2023-07-11 03:10:36 +03:00
b9552e596f
Reduce folderview menu bloat via lazy creation on right click
2022-10-19 16:21:05 -04:00
372e5b6dfa
SL-3007 Report abuse option in paticipan list
2022-09-08 02:19:13 +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
a5b1c01354
SL-16234 handle closing floater correctly
2021-10-25 21:23:26 +03:00
f2eba1909d
SL-16234 FIXED Frame stall caused by unnecessary building the floater when exiting viewer
2021-10-22 16:09:41 +03:00
a0a235784f
SL-15950 Crash at selectConversationPair
...
According to callstack data, new_selection was somehow 0x0002 which is invalid.
According to logs, session was just deleted, right before opening floater to some other session by arriving message, likely to the removed one.
2021-09-06 22:37:24 +03:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
3c002e7db5
SL-14975 SL-14384 viewer crashes because of large chat groups
...
1. Due to desync participant can be NULL - added NULL checks
2. With large backlog of events, closing and then opening a goup session was causing a crash due to obsolete events - added cleanup for backlog
3. In some cases events were accumulating faster than they were processed - ensured that after certain point event processing scales up with a backlog
2021-03-26 15:47:49 -06:00
609a26b59a
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint
...
# Conflicts:
# autobuild.xml (llca)
# indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
# indra/newview/llscenemonitor.cpp (SL-14422)
# indra/newview/llvovolume.cpp (SL-12069)
2021-02-01 22:28:15 +02:00
f86014ef15
SL-14270 Crash on participant's updateName
...
Session was deleted before viewer had a chance to create view for listener, so listener ended up not deleted and avaiting an uptade, then tryed to call for deleted session.
2021-01-06 01:33:26 +02:00
0bba892bb0
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llfloatereditextdaycycle.cpp
# indra/newview/llfloaterfixedenvironment.cpp
2020-11-13 18:22:43 +02:00
0303dd8179
Merge branch 'master' into DRTVWR-513-maint
...
# Conflicts:
# autobuild.xml
# indra/llui/llfolderviewmodel.h
# indra/newview/lltexturecache.cpp
# indra/newview/llviewermenu.h
# indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11 22:14:24 +02:00
1ff3f15203
SL-14074 LLConversationItemParticipant crash
2020-10-07 19:56:13 +03:00
1d458de949
Merge branch 'master' into DRTVWR-515-maint
...
# Conflicts:
# indra/newview/llpanelprimmediacontrols.cpp
2020-09-28 22:29:19 +03:00
a2cb61d9f4
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-09-28 22:08:48 +03:00
86e7cc3d35
Merge branch 'master' v6.4.9 into DRTVWR-497
2020-09-22 15:28:13 -06:00
825cfc2b6a
Merge branch 'master' into DRTVWR-507-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloaterconversationpreview.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.h
# indra/newview/llvoicevivox.cpp
2020-09-22 23:30:12 +03:00
2c93c14c9d
SL-13609 Better indicate which conversation is active in Conversations floater
2020-07-16 17:51:06 +03:00
e1e25f9a0d
SL-13397 Reduce Viewer freeze when opening chat with a large group.
2020-07-09 12:15:03 -06:00
9751942372
Small Cleanup
2020-05-18 18:33:08 +03:00
6a9658a650
SL-12452 FIXED The moderator can't unmute himself in the group call after turning on 'Mute everyone' option
2020-03-11 17:34:42 +02:00
779b5627c5
DRTVWR-493 LLAvatarNameCache to singletone
2019-07-03 20:06:47 +03:00
86d28366b1
SL-1811 Slight chat optimization
2019-02-20 20:30:43 +02:00
9ff12db91c
MAINT-8181 Save conversation panel width between sessions
2018-02-28 12:44:51 +02:00
e72c120e9e
MAINT-6805 Fixed Right-click menus in the right and left panes of the Conversations windows are different
2017-05-17 22:34:50 +03:00
605160d501
MAINT-7118 Swapping legacy people API with new cache
2017-02-15 20:40:03 +02:00
92d84a9c36
MAINT-7022 Crash in LLFloaterIMContainer::visibleContextMenuItem()
2016-12-27 12:04:51 +02:00
c92eb7e591
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2016-08-30 11:36:06 -04:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
d6284458e5
MAINT-5297 Backed out changeset: bfef055de5f5
2015-11-19 22:17:54 +02:00
Andrey Kleshchev