Commit Graph

39 Commits (40e93e9f4d9059a298e16009483cf531eccd7c82)

Author SHA1 Message Date
Ansariel 9fdca96f8b Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
Ansariel 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
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 a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Andrey Kleshchev a53d111cfa SL-15039 Prune unused preferences #2
List of removed preferences (usused per statistics):
BottomPanelNew
BrowserHomePage
BlockSomeAvatarAppearanceVisualParams
ButtonHPad
ButtonHeight
ButtonHeightSmall
CacheNumberOfRegionsForObjects
ChatBarStealsFocus
ChatLoadGroupTimeout
ChatPersistTime
ChatShowTimestamps
ContextConeInAlpha
ContextConeOutAlpha
ContextConeFadeTime
ConversationHistoryPageSize
ContactsTornOff
CurlMaximumNumberOfHandles
CurlUseMultipleThreads
CustomServer
DebugShowPrivateMem
2023-09-22 19:28:23 +03:00
Mnikolenko Productengine c49565be6e SL-13858 FIXED Group chat transcripts named with double (group) (group).txt after opening chat history. 2020-08-25 21:19:41 +03:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
andreykproductengine 0ea0b98084 DRTVWR-493 LLLogChat to singleton 2019-09-16 20:32:25 +03:00
maxim_productengine 9773e06cc1 SL-11753 FIXED Group & Resident with the same name share chat history. 2019-08-21 16:22:43 +03:00
andreykproductengine 779b5627c5 DRTVWR-493 LLAvatarNameCache to singletone 2019-07-03 20:06:47 +03:00
andreykproductengine 26fae750ba SL-10291 Replace apr_mutex with standard C++11 functionality 2019-01-14 22:04:44 +02:00
andreykproductengine 605160d501 MAINT-7118 Swapping legacy people API with new cache 2017-02-15 20:40:03 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
PavelK ProductEngine 443c502ccc MAINT-3476 FIX Opening large chat histories from conversation log eats up huge amounts of memory, leading to viewer crash. 2013-12-03 19:32:56 +02:00
maksymsproductengine 60b20e3bd8 MAINT-3117 FIXED crash in LLFloaterConversationPreview::showHistory() - optimization 2013-09-10 22:12:11 +03:00
maksymsproductengine 8a0b7eaadd Merge for MAINT-3117 2013-09-10 20:17:43 +03:00
dmitrykproductengine d995782edf MAINT-3117 FIXED crash in LLFloaterConversationPreview::showHistory()
Updated fix with a more complex and stable version. Integrated solution from the CHUI-836.
2013-09-10 10:34:20 +03:00
dmitrykproductengine 6198219d9d MAINT-3117 FIXED crash in LLFloaterConversationPreview::showHistory() 2013-09-09 21:19:44 +03:00
maksymsproductengine 4833fada10 merge from viewer-chui 2013-09-05 03:39:49 +03:00
dmitrykproductengine cedc571e4b MAINT-3095 FIXED Viewer crashes after opening Nearby chat history, if it is empty 2013-09-04 13:09:35 +03:00
maksymsproductengine e5597b83cf CHUI-836 FIXED [CHUIBUG]Opening chat history from the conversation log sometimes crashes the viewer 2013-09-03 20:24:49 +03:00
maksymsproductengine 53eff025bc MAINT-2938 FIXED [CHUI] crash in LLFloaterConversationPreview::showHistory() 2013-08-15 20:24:02 +03:00
Mnikolenko ProductEngine 13361137d0 CHUI-978 FIXED Load data from chat log file in separate thread to prevent viewer freeze 2013-07-09 15:13:38 +03:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
maksymsproductengine 4b6e1c26f0 CHUI-633 FIXED User is not able to open chat history by 'View chat history' menu item from pop-up menu of People floater 2013-02-22 17:08:33 +02:00
maxim@mnikolenko e6000d5930 CHUI-424 FIXED Args for appendMessage() are added to respect Compact/Expanded mode 2013-01-23 14:32:18 +02:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed:
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
2012-11-09 12:45:36 +02:00
Paul ProductEngine fcb010e835 CHUI-338 FIXED (LLAvatarNameResponder warning shown in debug console when using spinner to page through chat history viewer)
- Trying to restore avatarID by its name before appending message to chat history.
- Also prevented requesting avatar name by null LLUUID in LLAvatarIconCtrl::setValue
2012-09-19 19:20:21 +03:00
Paul ProductEngine a6370cf4a7 CHUI-334 FIXED (Date not shown in the chat log for current date entries)
Before the "%Y/%m/%d" was always cutted from timestamp string for today's date. Now I added flag whether we should cut off timestamp or not.
2012-09-13 18:49:57 +03:00
Paul ProductEngine cb8ce11418 CHUI-336 FIXED (Remove Description label and field from Chat history viewer)
- Removed lineeditor and text box from code and xml
2012-09-11 18:37:05 +03:00
Merov Linden 20b95f6ac0 Attempt to fix Linux build 2012-09-10 11:02:13 -07:00
Paul ProductEngine 62eb7ec030 CHUI-318 FIXED (User cannot navigate forward in chat history viewer once the More History option is selected.)
- Added spinner so that user could select desired history page. Also displaying total count of pages.
2012-09-06 23:34:47 +03:00
Paul ProductEngine dab6788c42 CHUI-157 FIXED (Implement menu bar for conversation floater)
- Added View Nearby chat history option
- Also replaced menu item "Add Friend / Remove" with two separate menus: Add Friend and Remove Friend. So if user is a Friend the Remove Friend option would be shown there. If the user is not a friend, the Add Friend option would be shown.
2012-08-31 11:57:36 +03:00
William Todd Stinson 11e9f66e62 BUILDFIX: Correcting a linux build error. 2012-08-28 12:41:57 -07:00
Paul ProductEngine d4ee17e533 CHUI-275 FIXED (Chat history viewer does not show entire user.txt IM log file)
- Renamed LLLogChat::loadAllHistory to LLLogChat::loadChatHistory because it doesn't actually loads all history. Also added parameter to the function which is a flag whether to load all file's content or not.
- Implemented displaying history by pages (as was decided on meeting page): Added showHistory() method to the LLFloaterConversationPreview which shows the chat history page by page starting from the last conversation (or may say starting from the last page). One page contains 100 entries. Added "More history..." button to display next page of history.
2012-08-28 14:48:32 +03:00
Paul ProductEngine 0ee0a5eff4 CHUI-151 FIXED (Implement conversation log)
A brief explanation of what have been implemented. More information can be found in comments.

1. Created conversation history viewer (llfloaterconversationpreview)
2. Created LLConversation and LLConversationLog classes which represent and hold data of conversations (llconversationlog)
3. Created LLConversationLogList and LLConversationLogListItem which are the visual representation of LLConversationLog and LLConversation respectively
4. Created LLFloaterConversationLog - which holds and displays LLConversationLogList
2012-07-27 22:25:17 +03:00