cf2f48de06
Merge branch 'release/2025.04' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llflatlistview.cpp
# indra/llui/llstyle.cpp
# indra/llui/llstyle.h
# indra/llui/lltextbase.cpp
# indra/llui/llurlmatch.cpp
# indra/llui/llurlmatch.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlist.h
# indra/newview/llavatarlistitem.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llfloaternewfeaturenotification.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llvovolume.cpp
# indra/newview/skins/default/colors.xml
2025-04-26 00:31:04 +02:00
17561e2ad1
#3758 show mention name in bubble chat
2025-04-23 21:04:47 +03:00
80f9aaa46e
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Audio.cmake
# indra/llui/llconsole.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterscriptedprefs.cpp
# indra/newview/llhudnametag.cpp
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llscripteditor.cpp
# indra/newview/lltexturefetch.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llviewerchat.cpp
# indra/newview/llviewerchat.h
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewerparceloverlay.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvosurfacepatch.cpp
2024-08-05 20:10:02 +02:00
409b9eebe1
Fix chat text segments not dynamically updating when colors changed in preferences
2024-08-04 23:11:57 -04:00
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
0d67b1814a
Throw in more "modern" stuff...
2024-05-20 13:12:15 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +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
719a2d31dc
Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llui/llscrolllistctrl.h
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/textures/textures.xml
2023-04-22 12:02:23 +02:00
97b0ba2a6d
SL-19575 LLFloaterEmojiPicker - Add filter by category
2023-04-20 03:55:02 +02:00
09c3b3b2b7
FIRE-31034: New teleport info system message ignoring system chat color
2021-06-30 21:07:23 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
1394cebb4e
Factor our calls to LGGContactSets::getFriendColor
2015-07-09 16:36:33 +02:00
668142e948
FIRE-3572: Customize local chat color brightness change based on distance (part 2)
2015-03-27 14:07:27 +01:00
f9dccaefb5
FIRE-3572: Customize local chat color brightness change based on distance
2015-03-27 12:55:53 +01:00
23246eee32
Just some cosmetics...
2015-03-06 20:24:07 +01:00
71ccfd5bc5
FIRE-11681: IM messages in chat console don't use keyword color
2015-03-06 20:00:44 +01:00
bc2fff3e3d
Optimize keyword check in LLViewerChat::getChatColor() - only do the expensive keyword check if we actually want to replace the color
2015-03-06 17:14:49 +01:00
6ffbf0d049
More Growl/Keyword refactoring:
...
* Remove the Growl keyword alert from LLViewerChat::getChatColor() again - this still might get called up to 3 times per message
* Move the Growl keyword alert back into FSKeywords::notify() where it belongs
* Explicitly wire up Growl keyword alerts in radar notifications in FSRadar::radarAlertMsg()
If there are particular system messages that should be checked for keywords as
well, wire them up in the correct place instead of using LLViewerChat::getChatColor()
that will result in an incorrect behavior of
* not playing the keyword alert sound
* being checked only at the time somebody calls LLViewerChat::getChatColor (Console output, nearby chat floater becoming visible etc.)
* getting called multiple times
2015-03-06 17:11:21 +01:00
1462f7b70e
Get rid of Growl notifications for object IMs in LLViewerChat::getChatColor() - this gets called up to 3 times per chat message!
2015-03-06 15:32:04 +01:00
b44309c4c6
IRC emote prefix is only lowercase letters
2015-03-02 11:09:42 +01:00
02aeb15dc0
FIRE-14553: Growl shows notifications from muted objects
2014-09-12 09:44:01 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
c82ac1e5f6
FIRE-13649: Chat history doesn't obey muted chat color setting
2014-05-06 19:44:01 +02:00
a097823b40
FIRE-6238: objectim SLURLs don't get handled correctly if the object's name contains ampersands - more fixing
2014-01-16 14:34:55 +01:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
f441613e79
Partially reverting fix for FIRE-10178 (1f33a208e62b) because of problems with Growl, restoring old behaviour for it in Keyword Alerts
...
Moving back gGrowlManager->notify to llviewerchat.cpp; "FSKeywords::notify" is now used only for triggering sound
2013-10-08 18:29:51 +02:00
01855fabc7
Refactor OpenSimExtras to use lfsimfeaturehandler with permission from Liru Færs
2013-10-07 23:33:07 -06:00
e1ac33104f
FIRE-10178: Keyword Alerts in group IM do not work unless the group is in the foreground, original patch provided by Manami Hokkigai
...
"Moved alert handling out of the window drawing, and into the message receipt function"
Most probably is also fixing FIRE-6144 ("keyword alerts are triggered by chat history reloading")
2013-09-04 09:15:08 +02:00
9cf44eacc4
FIRE-10827: Be a little more lenient on coloring when rlv showname restricted
2013-08-16 12:23:31 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
236710ae91
FIRE-1061 Refactor: Allow independent coloring of chat, name tags, and mini-map. Reorganize the Color Preferences panel
2013-05-29 00:40:35 -06:00
a1a7d4373b
More FIRE-1061: Don't use UserChatColor for chat unless we enable it
2013-05-27 10:52:28 -06:00
c2027a4ea0
FIRE-1061: Add a colors tab in prefs to control colorizing chat, net map dots, and nametags for self, friends, muted, lindens, and firestorm team members.
2013-05-26 17:23:21 -06:00
0ec85b723e
Contact Sets cleanup Pass #3 :
...
* Removed unused methods
* Refactor hasFriendColorThatShouldShow to use an enum for clarity
* More style cleanup
2013-03-22 21:45:06 -06:00
5572302504
Trivial whitespace cleanup...
2013-03-22 18:16:47 -06:00
97fb97d8e9
Fix the build on mac and linux by having the correct header file included on all platforms also.
2013-03-01 11:43:58 -08:00
79cd1ac048
FIRE-5889: Object IM's Not Triggering Growl Notifications
2013-03-01 11:12:25 -08:00
4079087420
Fix growl to work on keyword alerts on all platforms, not just windows.
2013-03-01 10:29:23 -08:00
6e07193eec
Stop spamming the log with "Getting SLURL for an unsupported sender type: 0" error messages - system messages are a well-known source
2013-01-31 23:35:05 +01:00
3e13995a3d
FIRE-8046: Support for Aurora Sim Var region - Adapted from Angstrom Viewer with thanks to nhede Core and Revolution Smythe. Also adds support for certain other aurora-sim features which still need some work.
2012-10-28 08:03:39 -06:00
5d0dbff1e4
FIRE-3152: Added "huge" font size option for chat window and console, enlarged it a little in Contact Sets
2012-08-27 21:07:55 +02:00
77c9230279
Fixing mac and linux compile.
2012-02-22 16:10:53 -08:00
44c296c448
Merging in latest changes for growl.
2012-02-22 13:35:33 -08:00
890ba6d0fa
Merging up the growl branch to latest default tip.
2012-02-22 13:22:05 -08:00
76b139b467
Fixing keyword alerts to pick up on chat messages sent from the system, allows things like radar alerts to be caught and growled.
...
--HG--
branch : growl
2011-10-11 16:01:40 -07:00
b782608922
Adding growl to keyword alerts.
...
--HG--
branch : growl
2011-10-11 14:49:11 -07:00
3b1f31d870
Second sweep of Phoenix -> FS settings change. Per Account settings.
2011-10-10 06:18:03 +02:00
Ansariel