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

330 Commits (ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a)

Author SHA1 Message Date
Oz Linden 4dccf30bf3 merge changes for 3.6.7-release 2013-10-03 18:04:27 -04:00
Oz Linden d53f9366d0 merge changes for storm-1888 2013-09-09 16:04:45 -04:00
simon 27d637d0f1 Merge downstream code from CHUIStorm release 2013-08-26 14:43:23 -07:00
Cinder Roxley 97ed20a12b Merged lindenlab/viewer-release into default 2013-06-27 21:31:48 -06:00
Dave Parks 79029149a4 Automated merge with file:///F:%5Cviewer-bear 2013-06-21 12:51:29 -05:00
Merov Linden b3c010ea71 Pull merge lindenlab/viewer-release 2013-06-19 12:24:44 -07:00
Cinders 4cf16ffdfb STORM-1888: Hide Spellchecker Settings floater when Preferences floater is closed 
Bonus: Correct the immediately preceding auto replace comment
 2013-05-22 21:43:32 -06:00
PavelK ProductEngine 3187ee18e1 CHUI-945 FIXED Add Object IMs to Chat Notification Preferences 2013-05-15 20:31:47 +03:00
Graham Madarasz 0f3cbfafcb NORSPEC-170 make adv lighting checkbox reflect whether deferred shaders loaded successfully 2013-05-09 14:01:31 -07:00
Graham Madarasz (Graham) 9187a06d0b NORSPEC-151 make disabling bumpyshiny disable adv lighting model as well 2013-05-03 09:16:15 -07:00
simon b42b789723 Merge in downstream code (chui fixes, materials) 2013-04-11 16:18:34 -07:00
callum_linden 1d3f018e81 MAINT-2417 FIX Update Graphics tab layout 2013-04-09 17:04:57 -07:00
AlexanderP ProductEngine 3b51f73b7c CHUI-799 FIXED Notification is not given to user when they select only friends and groups can IM me preference 2013-03-28 19:06:39 +02:00
Merov Linden d37b3ca62e CHUI-839 : Fixed! Make the LLLineEditor in chat preferences read-only but selectable 2013-03-13 13:40:26 -07:00
Gilbert Gonzales 6b067125a0 CHUI-778: Adjusted text in prompts for deleting chat log and chat transcripts (per UX). 2013-03-11 14:49:24 -07:00
Gilbert Gonzales 9f965be297 CHUI-778: Now when changing paths for chat logs and transcripts any empty conversations will be reloaded with data from the new location. Use case for this is if the users nearby chat is empty and they switch to a location that has a nearby chat file, then the nearby chat file be loaded. 2013-03-04 10:11:51 -08:00
Gilbert Gonzales e5d6b29260 merge 2013-02-25 12:57:39 -08:00
Gilbert Gonzales c70a951abd CHUI-778: Pushing a quick fix that only pertains to CHUI-778 so we can close out this issue. 2013-02-25 11:41:22 -08:00
Gilbert Gonzales 05f4e8a105 CHUI-778 (Saving preferences updates text in all open message panels in conversation floater to show as old messages) Now changing the log/transcripts file location actually moves the files to the new location. Prior behavior just started a new history at that location. Also a fix was made so that if the user changed the log/transcripts path then after pressing the Preferences 'OK' button the new location will be saved to the corresponding .xml file. 2013-02-22 18:53:40 -08:00
Gilbert Gonzales 10dfe2d534 CHUI-778: Minor changes, prior commit was not changing the file path correctly due to logic error. Also clicking the 'Cancel' in preferences would still cause the file location to be saved instead of ignore the save. 2013-02-20 15:51:44 -08:00
Gilbert Gonzales 61c1b2fe2b CHUI-778 (Saving preferences updates text in all open message panels in conversation floater to show as old messages) Problem was that closing the preferences floater was always acting as if the conversation transcripts/log files path had changed. If the path did not change then the user's conversations would be cleared and re-loaded as if they were part of the user's history (causing text to be grey). Solution: Now keep track of when the path was changed and only load up the transcripts/log upon change. 2013-02-19 16:38:22 -08:00
Mnikolenko ProductEngine e4ea94b622 CHUI-779 FIXED Chat log preferences are disabled before login. 2013-02-18 18:56:22 +02:00
Mnikolenko ProductEngine fdd55c279e CHUI-742 FIXED Do not update Log locations immediately after selecting a new location. 2013-02-18 14:59:03 +02:00
Mnikolenko ProductEngine 8aaedd0a5f CHUI-742 FIXED Update log location when closing Preference floater. 2013-02-12 14:27:52 +02:00
maksymsproductengine ec0ac12eba CHUI-712 FIXED IM log files renamed with ll.txt will create double files for users 2013-02-06 20:51:14 +02:00
Mnikolenko ProductEngine 2f6ffe2183 CHUI-721 FIXED Delete transcripts when performing Clear log action. 2013-02-04 14:37:29 +02:00
maksymsproductengine 2ac99f55f9 CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tab 2013-01-24 19:56:13 +02:00
Merov Linden 12554bffb3 CHUI-580 : Fixed : Avoid fetching names while reacting to display name checkbox change (overkill), make display name pref disabled when usePeopleAPI is off 2013-01-04 20:23:14 -08:00
William Todd Stinson 78b7a4b37c Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-12-12 12:48:59 -08:00
Dave Parks 72cbe5b942 MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering enabled. 
Reviewed by VoidPointer
 2012-11-26 17:10:22 -06:00
maxim_productengine a4a6e5a17d CHUI-523 Additional fix 2012-11-21 15:26:56 +02:00
maxim_productengine e52c0218c7 CHUI-523 FIXED Set visibility of warning message depending on combobox state. 2012-11-20 18:40:53 +02:00
maksymsproductengine 7a088e9b2c CHUI-501 FIXED Add link to Privacy tab from Comms floater 2012-11-14 19:39:50 +02:00
AlexanderP ProductEngine 486bdf3284 CHUI-337 FIXED: To avoid confusion with a classes "...conversation..." and in accordance with the naming convention in the project, some classes and corresponding files should be renamed: 
LLIMConversation -> LLFloaterIMSessionTab
LLIMFloater -> LLFloaterIMSession
LLNearbyChat -> LLFloaterIMNearbyChat
LLIMFloaterContainer -> LLFloaterIMContainer
LLNearbyChatBarListener -> LLFloaterIMNearbyChatListener
LLNearbyChatHandler -> LLFloaterIMNearbyChatHandler
 2012-11-09 12:45:36 +02:00
William Todd Stinson c4eaaa3d6a CHUI-484: Updating the code to rather than refer to it as Busy Mode, it now refers to it as Do Not Disturb mode. 2012-11-08 12:35:15 -08:00
Todd Stinson ce417a01c9 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-09 15:40:35 -07:00
Todd Stinson 9488baada3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-08-09 12:06:09 -07:00
prep@lindenlab.com 575a04b4b4 Path-643. Once the preferences panel is closed (either through ok or cancel), the pathing console rebuilds the gfx data. 2012-07-31 16:43:11 -05:00
Todd Stinson 3e038cd71b Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-27 12:53:54 -07:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Oz Linden 1b8bbc7b86 PATH-773: fix up how the location and grid selectors work on the login panel 2012-06-25 17:04:32 -04:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Merov Linden c8857cc722 CHUI-142 : Changes to chat related preferences 2012-06-19 19:25:58 -07:00
Oz Linden 925db41711 merge changes for storm-276 2012-05-31 14:26:15 -04:00
Kitty Barnett 53222ef517 STORM-276 Match preferences look to that of the auto-replace functionality in STORM-1738 2012-05-31 02:56:42 +02:00
AlexanderP ProductEngine 47ec4faeb4 CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-container 2012-05-30 19:58:20 +03:00
Todd Stinson 55392ef7f6 EXP-1942,EXP-1945: Altering behavior when setting maturity preference to check the server response in an effort to ensure the viewer and server remain in sync. This is a partial commit as I still need to add user behavior and notifications when things go wrong. 2012-05-24 19:41:20 -07:00
AlexanderP ProductEngine 4fc8000d66 CHUI-105 ADD. FIX Implement changes to all open conversations and nearby chat 2012-05-17 19:35:05 +03:00
Oz Linden ce17ae8a18 STORM-1738: get autoreplace preferences working, clean up some coding and naming conventions 2012-05-12 07:29:25 -04:00
Oz Linden fb44dbb164 move preferences from Advanced menu to Chat tab of preferences floater 2012-05-11 14:45:31 -04:00