livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,991 Commits
2 Branches
0 Tags
319 MiB
Commit Graph

234 Commits (05935d09124db6834ed7262b94de7558b6738590)

Author SHA1 Message Date
Arrehn 7394730eaa Merge up to LL FUI 2011-10-28 02:00:09 -04:00
WoLf 65185139cc First sweep of changes for settings (and a few functions) from Phoenix prefix to FS. 2011-10-10 06:10:45 +02:00
Kadah_Coba db775b9b21 Changed PhoenixFontChatLineSpacing to pixels instead of multiple 
TODO: figure out what the equivalent V1 value is (its not 7px)
 2011-09-20 01:03:01 -07:00
Kadah_Coba 4c8fdd8ef8 Added chat text line spacing setting 2011-09-17 19:17:21 -07:00
Arrehn 5d9dcdfaf4 FIRE-2852, Fill in [CURRENT GRID] instead of [SECOND LIFE], by Selo Jacobus. 2011-08-29 16:25:26 -04:00
Arrehn d7589b7749 FIRE-1641, Hide Timestamps in nearbychat option from Selo 2011-08-14 08:06:14 -04:00
Arrehn 03e3fd46a9 Backing out timestamp patch, needs to be reworked as a Hide option to protect compatibility with IM. 2011-08-11 23:05:38 -04:00
Arrehn 7930251bb7 FIRE-1641, Option to avoid timestamps in nearby chat, Initial patch by Selo Jacobus 2011-08-11 13:24:18 -04:00
Arrehn 61cb88c510 Mini-merge up to FS-tip. Note: Reverted OSX Lion build sdk changes, due to failure to produce a viable build on snowleopard. 2011-08-05 11:35:59 -04:00
Arrehn e277b8a4ac Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins. 2011-08-04 11:53:40 -04:00
Ansariel 8485bff29b Option to show (group) IMs in nearby chat plus separate save option. Fixes FIRE-1086 2011-07-18 21:06:58 +02:00
ziree b8eeb96c56 Made italic style /me emotes optional 2011-06-26 00:48:17 +02:00
Arrehn 7c3db82ffa FIRE-960, Remove overwriting text that conflicts with FS vertical tabs defaults 2011-06-05 19:14:00 -04:00
Kadah 30661e0188 Added code support for keyword alerts 2011-05-11 00:11:17 -07:00
Kadah d31c40fbcd FIRE-479: Bold for Moderators in Group Chat (PhoenixBoldGroupMods) Needs to be added to prefs 2011-04-24 21:17:51 -07:00
Arrehn 9baa80eb6a FIRE-716, When showing displayname/username , only show username if display name != legacy name, by Ansariel Hiller 2011-04-17 23:12:01 -04:00
Nyx (Neal Orman) 2deea74cf6 merging mesh-development into nyx's mesh development 2011-04-08 15:58:11 -04:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Vadim ProductEngine df450ff17b STORM-1021 ADDITIONAL_FIX Replaced usual object inspector with the remote one in nearby chat toasts. 2011-03-23 22:58:49 +02:00
Nyx (Neal Orman) 9f2987d995 second pass at render complexity debug display. 2011-03-23 16:01:12 -04:00
Tozh ae79bc0da2 added wait for the display name update in nearby chat v1 compatibility mode 2011-03-20 23:54:05 -04:00
Kitty Barnett 7b0455ba0f Merged with default tip (Revision 78d1d228709c) 
--HG--
branch : RLVa
 2011-03-19 16:14:42 +01:00
Arrehn 37ed7daa03 FIRE-634 use different test for whether we want display names 
--HG--
branch : Firestorm_2.4.2
 2011-03-15 07:47:53 -04:00
Arrehn 1e950d0b2d FIRE-477 Text mode chat looks up display names + options 2011-03-12 08:54:53 -05:00
Vadim ProductEngine 845405cce6 STORM-1021 FIXED Viewer shows "L$300" instead of object IM details if object sends an IM from another region. 
The problem was caused by trying to lookup info for a *remote* object by its id in the gObjectList --
this is what the usual object inspector (LLInspectObject) does.

The fix saves the sender object info when a message arrives, then passes the info to the remote object inspector (LLInspectRemoteObject).
 2011-03-11 18:20:24 +02:00
Kitty Barnett 604345b918 Merged with .RLVa tip 
--HG--
branch : RLVa
 2011-02-19 01:12:23 +01:00
Seth ProductEngine 287c3fcffc STORM-433 FIXED Fixed reshaping notification panel with friendship offer when it is inserted into IM chat. 2011-02-04 21:01:01 +02:00
Arrehn a30a9064b1 Merge Firestorm up to LL 2.4 Release. (initial pass) 
RLVa needs additional merging
 2011-01-18 00:50:43 -05:00
Monroe Linden dee57bea25 Merge from viewer-development. 2010-12-20 11:21:17 -08:00
Kitty Barnett 922b851a5c Merged with default tip (Revision 1ed382c6a08b) 
--HG--
branch : RLVa
 2010-12-19 17:32:13 +01:00
Seth ProductEngine 7ed0938226 STORM-579 FIXED SLURLs color for residents and objects names in plain text chat match the user setting for "URLs" in the Color tab in Prefs. 
Avatar names SLURLs now use the user color setting for "URLs" everywhere across the viewer.
 2010-12-03 20:45:53 +02:00
Arrehn 66d402f0d8 Completed support for chat header coloring, plaintext and graphical. 2010-12-02 21:06:03 -05:00
Arrehn dc5250f237 chat text fixes + initial feature work. 
- Repaired ability to disable chat toasts
- iniitial implementation to disable chat icons
- initial groundwork for separate color for chat header names
 2010-12-02 01:29:48 -05:00
Kitty Barnett c1e2223e50 Merged with default tip (Revision dc6483491b4a) 
--HG--
branch : RLVa
 2010-12-05 01:50:09 +01:00
Richard Linden f8d08af9f1 SOCIAL-266 WIP HTTP AUTH dialogs no longer work in LLQtWebKit 4.7.1 
converted LLLayoutStack orientation param to use named enums
 2010-11-23 16:25:10 -08:00
Arrehn 5cfc22c3c8 Merge from ll snowstorm 2010-11-17 10:34:44 -08:00
Kitty Barnett dd5ce41d4f Merged with default tip (Revision 8301f50a65b0) 
--HG--
branch : RLVa
 2010-11-13 17:54:47 +01:00
Seth ProductEngine ef46e7037c STORM-579 FIXED resident SLURL font color to match Chat preferences for plain text Nearby Chat log 2010-11-12 17:28:44 +02:00
Arrehn 00313b22b3 Sync up with LL-head 
Hg: changed indra/newview/skins/default/xui/de/panel_group_land_money.xml
 2010-11-09 16:27:59 -08:00
Oz Linden b657516f72 pull beta changes back to development 2010-11-08 16:47:46 -05:00
Leyla Farazha 25c5f8aeb3 DN-189 ??? Showing in tooltip over profile image in IM history 2010-11-04 11:51:02 -07:00
Arrehn b96b8e3ca0 Merge with RLva-#head 2010-11-04 10:09:29 -07:00
Arrehn d0d3e716dc Rolling back before back RLV merge 2010-11-04 10:02:01 -07:00
Arrehn cc718fcdf2 Snowstorm syncup 2010-11-03 22:44:26 -07:00
Kitty Barnett 5173f3c6e9 - merge : anonymize names on the "Remote Object" inspector when @shownames=n restricted 
--HG--
branch : RLVa
 2010-11-02 15:35:21 +01:00
Kitty Barnett adf7147366 - review : @shownames=n related code in LLChatHistoryHeader class 
--HG--
branch : RLVa
 2010-11-01 14:39:31 +01:00
Kitty Barnett 38aae05b6e - merge : display name and user name shouldn't be in the chat history header when @shownames=n restricted 
--HG--
branch : RLVa
 2010-11-01 14:33:50 +01:00
Arrehn 8fcb69d0c3 Integration of RLVa, pre-display names. 
HUDtext updates may be broken, much testing needed.
I expect this merge to be improved and even fully replaced by up and coming RLVa work.
When we do get a clean merge of RLVa, it should stay clean.
It does compile ;)
 2010-10-31 20:47:18 -04:00
Kitty Barnett 9498c31d3c Merged with default tip (Revision aeb7e6c38341) 
--HG--
branch : RLVa
 2010-10-31 23:41:40 +01:00
Kitty Barnett 1c2ef4090a Merged with default tip (Revision f20bf424bd86) 
--HG--
branch : RLVa
 2010-10-30 17:28:00 +02:00