summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimnearbychat.cpp
AgeCommit message (Collapse)Author
2023-08-30SL-20210 Recent Emojis - Remember emojis that were actually sent in the messageAlexander Gavriliuk
2023-08-24Merge remote-tracking branch 'origin/main' into DRTVWR-489Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llmath/llvolume.cpp # indra/llrender/llgl.cpp # indra/llxml/llcontrol.cpp # indra/newview/llpanelnearbymedia.cpp # indra/newview/llsceneview.cpp # indra/newview/llselectmgr.cpp # indra/newview/llstartup.cpp # indra/newview/lltextureview.cpp # indra/newview/llvovolume.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml
2023-07-18DRTVWR-489: trivial merge conflict fixCallum Prentice
2023-07-17Merge branch 'main' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcommon/llerrorthread.cpp
2023-07-13SL-20001 EmojiPicker - make the preview to be a panel instead of a buttonAlexander Gavriliuk
2023-04-19SL-19609 Urls aren't dispatched according to the indicated gridAndrey Kleshchev
2023-02-14SL-19196 Nearby chat bar moves down every time it gains focusAndrey Kleshchev
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-16SL-18119 - UIUsage logs for some common operationsBrad Payne (Vir Linden)
2022-09-07SL-18102 Remove 'Translate chat' checkbox from chatMnikolenko Productengine
2021-03-01SL-14862 - more types of UI usage logsBrad Payne (Vir Linden)
2019-07-03DRTVWR-493 LLAvatarNameCache to singletoneandreykproductengine
2017-08-16merge changes for DRTVWR-439Oz Linden
2017-06-09MAINT-7478 Fixed "No callback" log spamandreykproductengine
2017-05-22Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-04-21Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-04-05MAINT-3595 Add the ability to turn off auto-complete of gestures in local chatMnikolenko Productengine
2017-03-06Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-02-15MAINT-7118 Swapping legacy people API with new cacheandreykproductengine
2017-02-09MAINT-7095 Fixed Detached and reduced nearby chat floater does not maintain ↵andreykproductengine
its position through viewer restart.
2016-12-20DRTVWR-418: Casting pointer to BOOL is just wrong.Nat Goodspeed
Since BOOL is simply a typedef for int, casting a 64-bit pointer to 32-bit int is correctly diagnosed by the compiler as an error. What works is to cast the pointer to (lowercase) bool, the builtin type, which engages the compiler's test for "is this pointer NULL?"
2016-07-12line endings fixandreykproductengine
2016-06-27MAINT-6518 allow negative numbered chat channelsandreykproductengine
2015-11-10remove execute permission from many files that should not have itOz Linden
2013-11-19SH-4634 FIX Interesting: Viewer crashes when receiving teleport offerRichard Linden
renamed fast timers to have unique names, changes instance tracker to never allow duplicates
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-08-19merge changes for DRTVWR-285Oz Linden
2013-09-17MAINT-3119 FIXED Select auto-completed part using cursor positionMnikolenko ProductEngine
2013-09-13Build fix after patch for MAINT-3137dmitrykproductengine
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-07merge changes for DRTVWR-333Oz Linden
2013-07-25CHOP-962: Make LLControlVariable::setPersist() accept only enum.Nat Goodspeed
Initial change made LLControlVariable::mPersist an enum, but retained bool/BOOL public API. setPersist(true) set one value, setPersist(false) set another, forcePersist() set the third. Per code review, expose enum to public, make setPersist() (and LLControlVariable constructor, and LLControlGroup:: declareControl(), and all the LLControlGroup::declareMumble() methods, and all the unit-test dummy declareMumble() method bodies) accept that enum. Remove forcePersist(). Fix calls to LLControlGroup::declareMumble() accordingly. Also rename PERSIST_YES to PERSIST_NONDFT, also per code review.
2013-06-27CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat ↵PavelK ProductEngine
window as well
2013-06-26CHUI-983 FIXED Call showHistory() after clicking toast as it was before. ↵Mnikolenko ProductEngine
Minor change in showHistory()
2013-06-19Pull merge lindenlab/viewer-releaseMerov Linden
2013-06-17merge changes for 3.6.0-releaseOz Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-05-30CHUI-971 FIXED Unnecessary checking was removed.Mnikolenko ProductEngine
2013-05-22Pull merge from viewer-releaseMerov Linden
2013-05-20merge changes for 3.5.2-releaseOz Linden
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-10CHUI-932 FIXED Restore previous text only if there is no gesture.Mnikolenko ProductEngine
2013-04-08CHUI-914 FIXED Restore previous text after gestures were triggered.Mnikolenko ProductEngine
2013-04-01CHUI-796 (User doesn't get all messages in 'do not disturb' mode): Now when ↵Gilbert Gonzales
a conversation is focused by clicking on it's line item, selecting a torn off floater or unminimized a torn off floater the stored notifications for that conversation will be removed.
2013-04-01CHUI-904 FIXED Set the focus on the Nearby chat floater after setting ↵Mnikolenko ProductEngine
visibility.
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-28merge changes for 3.5.0-beta6Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 18:35:43 +0000