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

221 Commits (5dcd81c15507ad8f487e5727bc7a94de82f6fb45)

Author SHA1 Message Date
Oz Linden bc22e58743 merge changes for 4.0.1-release 2016-01-15 16:55:04 -05:00
AndreyL ProductEngine d6284458e5 MAINT-5297 Backed out changeset: bfef055de5f5 2015-11-19 22:17:54 +02:00
AndreyL ProductEngine 0c4ec86424 MAINT-5297 Backed out changeset: dd9e3cbf10e5 2015-11-19 22:17:37 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
AndreyL ProductEngine eccafc5c40 MAINT-5758 FIXED "Ban Member" from the group chatters list context menu 
is greyed out once you have performed a ban, until you load the group
members list from group info.
 2015-10-27 14:04:25 +02:00
AndreyL ProductEngine 70136a7e3d MAINT-5297 Allow global toggle of 'View People Icons' - Global switch part 
--HG--
branch : develop
 2015-09-02 01:16:18 +03:00
AndreyL ProductEngine 540493b315 MAINT-5297 Allow global toggle of 'View People Icons' - Chat window part 
--HG--
branch : develop
 2015-09-01 23:16:58 +03:00
AndreyL ProductEngine 9e64435bd2 MAINT-5219 FIXED "Ban Member" from the group chatters list context menu is greyed out 
when you have the ability to manage the ban list
 2015-08-13 07:53:38 +03:00
Mnikolenko ProductEngine 394952e476 MAINT-5233 FIXED Viewer fall into recourse and crash when try open chat floater 2015-05-26 17:27:53 +03:00
Mnikolenko ProductEngine 193a298266 MAINT-5201 FIXED 'Chat history' option in context menu does not works for multiperson chat. 2015-05-19 12:01:32 +03:00
Mnikolenko ProductEngine 102908a2f2 MAINT-5206 FIXED always show Nearby chat on first opening of IMcontainer floater. 2015-05-15 11:43:13 +03:00
maksymsproductengine 9074ea1663 DRTVWR-373 Merge with viewer-release 3.7.13 2014-08-05 22:11:05 +03:00
maksymsproductengine 0f22bcdff0 MAINT-4263 FIXED Viewer crashes after right click on group in Conversations. 2014-07-16 02:16:48 +03:00
Mnikolenko ProductEngine b4df05d21a MAINT-4226 Group ban option is added to participant menu in Group chat. 2014-07-14 12:31:16 +03:00
maxim@mnikolenko f924175da0 MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselection 2014-06-18 13:00:18 +03:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Mnikolenko ProductEngine ccb91c6da4 MAINT-3963 FIXED The behavior of speak button in the conversations HUB and toolbar button is consistent now. Use setUserPTTState(false) to switch off the mic. 2014-05-12 11:52:39 +03:00
simon a5568f942b Merge downstream version 3.7.8 code 2014-05-07 15:28:13 -07:00
Mnikolenko ProductEngine 7698e169f5 MAINT-3186 FIXED Disable menu items if group or ad-hoc chat is in multiselection 2014-03-24 11:20:59 +02:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
simon c7aad1f7e3 Merge downstream code to 3.7.4 2014-03-11 10:41:52 -07:00
Baker Linden 28d3bb0975 [MAINT-3555][MAINT-3703] 
- Removed logging for MAINT-3555
- Added NULL guard to fix MAINT-3703 (hopefully)
 2014-03-03 11:53:57 -08:00
Baker Linden bd73465e51 [MAINT-3784] - Viewer takes too long to shut down 
- Removed a lot of logging code to reduce application close time
 2014-02-25 16:41:23 -08:00
simon dd8b32473e Merge downstream code 2014-02-25 16:47:31 -08:00
simon 76913530ed Merge downstream code 2014-02-21 11:10:16 -08:00
Baker Linden 7faaaa9b11 [MAINT-3555] Adding a bajillion log messages to (hopefully) narrow down the cause of the crash 2014-02-20 15:23:53 -08:00
Mnikolenko ProductEngine 3cb2dc6275 MAINT-3484 FIXED Disable menu item if transcript doesn't exist. 2014-02-05 11:43:09 +02:00
Richard Linden 6ddfc8031c BUILDFIX - miscellaneous stuff missed in the merge 2013-11-12 11:42:06 -08:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden fe518bde8e merge with release 2013-11-06 17:22:04 -08:00
Oz Linden 9c313aea13 merge changes for DRTVWR-336 2013-10-15 17:47:37 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Merov Linden 1e32b9dd33 Pull merge of lindenlab/viewer-release 2013-10-04 09:47:26 -07:00
maksymsproductengine 932882da22 Merge with bitbucket.org/msavchenko/viewer-release-maint-3132 2013-09-19 01:17:12 +03:00
Graham Madarasz (Graham Linden) b6cfd67a36 MAINT-3134 keep chat from opening in response to key confirm on quit dialog, fix mac-only sketchy precedence warning, and re-re-re-re-re-remove patch file that simply will not die. 2013-09-12 09:48:28 -07:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Gilbert Gonzales c767354a20 merging viewer release 2013-08-28 18:30:38 -07:00
Oz Linden 7ca10e5161 merge changes for 3.6.4-release 2013-08-26 15:14:12 -04:00
mberezhnoy 10419d802f MAINT-3020 ([CHUI] Torn off nearby chat is no longer visible after exiting mouselook) 2013-08-21 17:44:39 +03:00
simon 64c5afa196 Merge latest viewer-release with FBC 2013-10-23 14:14:36 -07:00
PavelK ProductEngine a0a1969965 MAINT-3031: Toggle Expanding CHUI when Icon is CLicked 2013-08-23 21:34:30 +03:00
PavelK ProductEngine f0a80bb49b MAINT-3030 [CHUIBUG]Conversations pane has alignment issues when collapsed 2013-09-06 17:48:48 +03:00
simon_linden d3625d0b67 Merge downstream code 2013-09-19 15:30:34 -07:00
dmitrykproductengine e3963666fd MAINT-3133 FIXED Expand Nearby Chat participant list on first open of Conversations floater, per login session 2013-09-13 14:40:22 +03:00
Mnikolenko ProductEngine 2a93275a2b MAINT-3137 FIXED We should handle condition when viewer is quitting 2013-09-12 17:26:13 +03:00
Richard Linden e340009fc5 second phase summer cleaning 
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
 2013-08-09 17:11:19 -07:00
PavelK ProductEngine d59b6e1d0a CHUI-817 FIX Revealing the "Conversations" window reveals hidden Nearby Chat window as well 2013-06-27 18:28:54 +03:00
Mnikolenko ProductEngine 8349b8234f CHUI-987 FIXED (Viewer crashes when you try drag and drop any object from inventory onto avatar’s name in resident picker) 2013-07-17 20:48:22 +03:00
Oz Linden 1108cd0e5c merge changes for 3.6.0-release 2013-06-19 17:56:43 -04:00
Merov Linden 7da4c65191 Pull merge from lindenlab/viewer-release 2013-06-19 14:06:06 -07:00