Commit Graph

380 Commits (05935d09124db6834ed7262b94de7558b6738590)

Author SHA1 Message Date
Ansariel 4a57699136 Crashfix: Debug setting "VoiceCallsRejectAll" has been removed 6 months ago as part of EXP-769 and the change was missed during merge 2011-11-18 18:37:49 +01: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
Arrehn 9fd0edb326 Initial 2.8.3+ merge, Tozh & Arrehn
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -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
Oz Linden f10384d014 merge changes for storm-941 2011-05-19 11:48:48 -04:00
Jessica e1066181d2 Applied patch from Ansariel Hiller for FIRE-1032, add ability to block group chat 2011-06-08 21:27:14 -04:00
ziree 9225cc6c96 Take preferences into account when showing online/offline messages for friends. Patch by Ansariel Hiller - FIRE-1226 2011-06-08 22:20:07 +02:00
Leyla Farazha 314961674a EXP-769 Group call requests received in Basic mode 2011-04-29 15:52:48 -07:00
Seth ProductEngine 4993cfba34 STORM-941 FIXED IM history to use the resident's user name for the log file name.
Added conversions from legacy names or SLURLs with avatar id to the user names in cases of logging P2P sessions and inventory offers.
Removed asynchronous writes to temporary IM log file depending on name cache responses.
2011-04-13 18:13:02 +03:00
Arrehn 594f3c0d84 FIRE-805 Initial implementation of console-style nearby chat notifications option. Thanks to Ansariel Hiller 2011-04-22 03:21:50 -04:00
Arrehn 10e88f3891 Merge with RLVa-LL2.5.2 2011-04-09 22:24:22 -07:00
Kitty Barnett 7b0455ba0f Merged with default tip (Revision 78d1d228709c)
--HG--
branch : RLVa
2011-03-19 16:14:42 +01:00
Don Kjer 8330a4d0fd Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/ 2011-02-19 00:17:12 +00:00
Kitty Barnett 604345b918 Merged with .RLVa tip
--HG--
branch : RLVa
2011-02-19 01:12:23 +01:00
Don Kjer 774405e92b Cleanup of headless client (was: DisableRendering mode)
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode.  This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
Tank_Master fd1dc7b2e1 Backported from Viewer-Release (13841 (ff28840ea96b) (DN-211) Conference call dialog shows Conference with ??? (???) in title header with view display names on and off) 2011-02-12 00:36:48 -08:00
Kitty Barnett 8537b509a1 Merged with RLVa-1.3.0c tip
--HG--
branch : RLVa
2011-02-03 01:19:03 +01:00
paul_productengine 1a1d5f4c00 STORM-507 FIXED User that has sent p2p call invitation to other user, is not added to Recent tab
- Add the caller to the Recent List just after Incoming Call floater appears. Before recicpient accepted or rejected the call.
2011-01-31 19:47:50 +02:00
Kitty Barnett 44c1d1a58a - internal : LLAvatarName::mIsDummy was renamed to LLAvatarName::mIsTemporaryName 2011-01-27 20:25:57 +01:00
Kitty Barnett 3a9c08aa5f Imported Chat-Logs patch from Catznip (revision e6e0393682f8)
-> Description:
- changed : LLCacheName::buildUsername() will properly extract the username if the passed name is a "complete name"
    -> "Catznip Catnap" => "catznip.catnap"
    -> "Catznip Tester (catznip.catnap)" => "catznip.catnap"
- fixed   : P2P IM session names are inconsistent (chiclet hover tip shows the legacy name rather than the complete name for incoming IM sessions)
    -> incoming IM session would have a session name of "Catznip Catnap" (legacy name)
    -> outgoing IM session would have a session name of "Catznip Tester (catznip.catnap)" (complete name)
    -> standarized P2P IM session names to "complete name"
- added   : LLIMModel::buildIMP2PLogFilename() to have one single function to construct log filenames for P2P IMs
- fixed   : teleport offers to another avie are logged to the wrong file when no IM session is open for that avie
    -> open IM session => logged to "catznip_catnap.txt"
    -> no open IM session => logged to "Catznip Catnap.txt"
- fixed   : inventory offers to another avie are logged to the wrong file when no IM session is open for that avie
    -> no open IM session => logged to "Catznip Catnap.txt"
- fixed   : inventory accepted/declined notifications are logged to the wrong file
    -> no open IM session => logged to secondlife____app_agent_<uuid>_completename.txt
- added   : "UseLegacyIMLogNames" setting to use "old-style" log filenames for P2P IM sessions (TRUE by default)
    -> needed for people who mix older and newer viewers
    -> side-steps any other remaining bugs due to log filename change
2011-01-26 00:19:43 +01:00
Arrehn 1bbff1ac31 Compensate for "???" with smarter caching. Uses Oz Linden's patch. More comprehensive than what we had previously. 2011-01-21 17:41:52 -05:00
Arrehn 0586dca369 Merge up part2 to Release 2.4.0 + RLVa . Needs live testing 2011-01-19 12:40:31 -05: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
Oz Linden c5d8624ba4 renamed temp name flag member in name cache to avoid confusion with similar names in other classes 2011-01-15 09:09:41 -05:00
Monroe Linden 1e050c2ed8 merge 2010-12-02 14:33:42 -08: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 af4c087be2 - added : @recvimfrom:<uuid>=n|y and @sendimto:<uuid>=n|y
--HG--
branch : RLVa
2010-11-30 14:03:25 +01:00
Kitty Barnett c1e2223e50 Merged with default tip (Revision dc6483491b4a)
--HG--
branch : RLVa
2010-12-05 01:50:09 +01:00
Merov Linden 2e46db239f Pull from viewer-beta 2010-11-24 13:57:22 -08:00
Leyla Farazha f3705df982 (DN-211) Conference call dialog shows Conference with ??? (???) in title header with view display names on and off
Inbox
X
2010-11-23 16:03:27 -08:00
Wolfpup Lowenhar 379c385877 STORM-102: this is to correct a minor issue with ad-hoc conferences so that they do not
get date stamped at all since each one is defined as a unique conversation.
2010-11-23 17:32:00 -05:00
Leyla Farazha 5b80dbff3a DN-211 Conference call dialog shows Conference with ??? (???) in title header with view display names on and off 2010-11-23 11:21:59 -08:00
Wolfpup Lowenhar 3eb3198248 STORM-654 : Person to Person chat logs are not created if Display Names are off
Modified code in indicated changeset to correct problem after consulting with
 Leyla Linden who sugested the orginal change. This fix will convert the Legacy
 name to a user name id not useing Display Names.
2010-11-18 18:30:00 -05:00
Richard Linden 50d21a75a7 merge 2010-11-15 15:52:54 -08:00
Kitty Barnett dd5ce41d4f Merged with default tip (Revision 8301f50a65b0)
--HG--
branch : RLVa
2010-11-13 17:54:47 +01:00
Wolfpup Lowenhar 2632565bbc STORM-102 : STORM-143 :Removed unneeded code in llimview. 2010-11-12 09:09:41 -05:00
Wolfpup Lowenhar 4077e6bb52 STORM-102 : STORM-143 :Made needed changes to code to improve searching for previous logs
and also changed the name used for P2P IM log file names. The latter change is going to
 temporarely break personal content for those that are saving conversation logs as P2P IM
 logs will now be useinf the user name and not the legacy name.
2010-11-11 22:50:14 -05:00
Kitty Barnett a3f63e3e9e Merged with default tip (Revision f38f27da53ca)
--HG--
branch : RLVa
2010-11-09 20:56:57 +01: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
Merov Linden 94c41b2c00 STORM-255 : merge with viewer-development 2010-11-01 22:02:29 -07:00
Merov Linden 44f6b6ea47 merge from viewer-beta 2010-11-01 17:34:45 -07: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
Leyla Farazha 360ce3d667 DN-190 Last name resident shown in title of IM Conference Window with no Display name 2010-10-27 15:22:39 -07:00
Wolfpup Lowenhar 379f9b8240 Made changes to setting names and in pannel_preferences_chat.xml for better understanding
as per Esbee's comments in STORM-255
2010-10-27 11:00:39 -04:00