9aa5e5f2e3
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
2024-09-09 17:56:52 +02:00
8c4c9fbe96
Put everything in FSCommon into the namespace with the same name
2024-09-06 14:29:02 +02: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
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
40ed5e9d2b
FIRE-20876: Add option to show Nearby Chat in console/toasts while bubble chat is enabled
2017-02-12 11:01:36 +01:00
f2e8e59745
Fix potential crash in FSConsoleUtils::ProcessInstantMessage()
2016-10-20 19:49:40 +02:00
f6a7664366
Minor performance improvement in FSConsoleUtils
2016-10-20 19:43:46 +02:00
28d861d982
Small cleanup in FSConsoleUtils
2015-11-19 17:02:06 +01:00
2a5bd3015a
Consolidate IRC /me prefix checks that are cluttered all over the place
2015-11-14 00:20:32 +01:00
9036ed275a
FIRE-2436: Change behavior of chat console: Chat console will now always show the chat for sessions that are currently not shown by a visible floater
2015-11-11 13:55:23 +01:00
28ae84f967
More cleaning up and fixing funky variable redefinitions
2015-05-09 13:11:01 +02:00
71ccfd5bc5
FIRE-11681: IM messages in chat console don't use keyword color
2015-03-06 20:00:44 +01:00
3f419f48f8
FIRE-11365: Fix trim resident name option for chat console
2014-08-12 20:43:59 +02:00
39727765a3
Optimize this...
2014-07-10 15:13:30 +02:00
429599f8bc
Refactor display name handling based on display name and username visibility setting
2014-05-16 10:05:54 +02:00
7903e7bb21
Fix RLVa shownames restriction being over-applied to IMs shown in chat console
2014-05-11 17:57:09 +02:00
110530cba3
FIRE-11365, FIRE-11386, FIRE-11455 Trim "Resident" from legacy names fixed; Use getUserName(), and getUserNameForDisplay(), in favor of getLegacyName()
2013-09-02 11:17:50 -06:00
3b9dd14bd7
FIRE-11198: Make FIRE-10935 an optional color by adding a switch, default to previous behavior
2013-07-31 11:49:44 -06:00
0803a761b2
Merge
2013-07-31 01:48:19 -06:00
49d6305bb5
Backout changeset b99fba6f48c820187532bb72dda94ac90e9c2d2d
2013-07-31 01:46:14 -06:00
95820a6991
Localized IM Prefix everywhere
2013-07-22 15:55:31 -06:00
e98efe34e3
Fixed reporting to nearby chat not showing in console
2013-07-16 00:41:11 +02:00
a8cbee6e81
More compile fixes and hooking up of FS communication UI
2013-06-28 23:34:21 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -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
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
9304da986e
FIRE-10935: Allow the user to use a distinct color for IM/Group chat in the console
2013-07-27 18:40:04 -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
8736b53149
More lggcontactsets cleanup:
...
* Make LGGContactSets a proper singleton
* Convert ints to U32
* Misc coding standard cleanup
2013-03-22 18:03:55 -06:00
e310cd5657
Merge with Firestorm LGPL tip
2013-03-14 11:04:28 +01:00
9eeebe39a2
FIRE-9455: Chat console becomes invisible at various occasions
2013-03-14 09:30:42 +01:00
6bbd5d01fb
Merge with Firestorm LGPL tip
2013-03-09 15:56:31 +01:00
7abcf40dec
Fixed some Firestorm license headers
2013-03-06 14:07:56 +01:00
63ef2950e9
CHUI preparation phase 1: Move FS-specific communication parts into a separate domain and out of the way for CHUI merge to reduce conflicts
...
* LLChatHistory moved to FSChatHistory
* LLFloaterNearbyChat moved to FSFloaterNearbyChat
* LLIMFloater moved to FSFloaterIM
* LLIMFloaterContainer moved to FSFloaterIMContainer
* LLNearbyChatbarListener moved to FSNearbyChatbarListener
* LLNearbyChatControl moved to FSNearbyChatControl
* LLNearbyChatHub moved to FSNearbyChatHub
* floater_im_container.xml moved to floater_fs_im_container.xml
* floater_im_session.xml moved to floater_fs_im_session.xml
* floater_nearby_chat.xml moved to floater_fs_nearby_chat.xml
* widget chat_history.xml moved to fs_chat_history
* widget nearby_chat_control.xml moved to fs_nearby_chat_control.xml
2013-02-28 18:57:38 +01:00
bd86a614b8
Refactored chat console handling:
...
* Created new class FSConsoleUtils to handle console-related tasks
* Moved IM in console handling from IMHandler to FSConsoleUtils
* IMHandler is now stock V3 and will produce no problems anymore once it goes away with CHUI
* Nearby chat handling moved from LLNearbyChatHandler to FSConsoleUtils
* LLNearbyChatHandler::processChat() is now mostly stock V3 to reduce problems with CHUI
* (Group-)IMs in chat console settings are now independent from their corresponding toasts counterparts and can be set independently
2013-02-27 14:09:28 +01:00
Ansariel