summaryrefslogtreecommitdiff
path: root/indra/newview/llchathistory.cpp
AgeCommit message (Expand)Author
2023-01-20Fix merge conflicts after auto mergeCallum Linden
2022-11-09Merge branch contribution/emoji into DRTVWR-489-emojiKitty Barnett
2022-11-08Enable color emojis (and the emoji helper) on the chat history and editorKitty Barnett
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-06SL-3007 Small improvements for auto filling abuse reports #2Andrey Kleshchev
2022-08-17SL-17973 FIXED region name is not shown in the IM chatMnikolenko Productengine
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-17SL-3007 Small improvements for auto filling abuse reportsAndrey Kleshchev
2022-03-21SL-17040 Crash when looking for a region by handle or positionAndrey Kleshchev
2022-01-25SL-3007 mac build fixAndrey Kleshchev
2022-01-24SL-3007 Ability to report abuse from chatAndrey Kleshchev
2021-08-25SL-15881 Crash at setCommitCallbackAndrey Kleshchev
2021-02-04SL-14796 Updated code accordingly to changed event orderAndrey Kleshchev
2021-02-03SL-14796 After teleporting, add notation into Nearby ChatAndrey Kleshchev
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-07-21Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-05-18Small CleanupAndrey Kleshchev
2020-03-25DRTVWR-494: Defend LLInstanceTracker against multi-thread usage.Nat Goodspeed
2019-11-18SL-12305 More missing-file handlingandreykproductengine
2018-06-08MAINT-8742 Crashes at draw and getHandleandreykproductengine
2018-04-17MAINT-8498 Fixed item offers not appearing after friednship offerAndrey Kleshchev
2017-07-24MAINT-7629 FIXED Crash in LLSpeakerMgr::findSpeaker(LLUUID const &)Mnikolenko ProductEngine
2017-05-17MAINT-6805 Fixed Right-click menus in the right and left panes of the Convers...andreykproductengine
2017-02-15MAINT-7118 Swapping legacy people API with new cacheandreykproductengine
2016-05-18MAINT-2129 "Block" button doesn't become disabledandreykproductengine
2016-05-19Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2016-04-20MAINT-2129 "Block" button doesn't become disabled in remote object inspector ...andreykproductengine
2016-01-15merge changes for 4.0.1-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-10-15MAINT-925 FIXED Objects called "Second Life" are unclickable & unmuteable via...Mnikolenko ProductEngine
2015-06-11MAINT-14 FIXED Region message logged into nearby chat log has duplicated send...Mnikolenko ProductEngine
2015-06-08MAINT-14 FIXED Treat region message like a system message, but also show send...Mnikolenko ProductEngine
2015-03-31MAINT-5020 FIXED Determine the need to use bracket via chat source.Mnikolenko ProductEngine
2014-10-27MAINT-4597 FIXED Show emoted name according to name settings in preferences.Mnikolenko ProductEngine
2014-05-02MAINT-4009: Patching the memory leak occurring from the info icons that appea...Stinson Linden
2014-03-12merge with releaseRichard Linden
2014-01-10Revert earlier back-out for MAINT-535 ... it's back insimon
2014-01-07Revert changes made for MAINT-535 to test in a release cohort.simon
2013-12-02merge with releaseRichard Linden
2013-11-25Merge - doh!simon
2013-11-12MAINT-3068 FIXED "Request Teleport" menu item is added to context menu.Mnikolenko ProductEngine
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-11Merge 3.6.11 for RC-abilityGraham Linden
2013-10-25Fix release merge issues (included upstream changes not yet in release from b...Graham Linden
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-08merge from viewer-releaseRichard Linden
2013-09-09merge with viewer-releaseRichard Linden