Commit Graph

89 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Merov Linden e3e1a527cc DRTVWR-354 : Rewrite Responders for Twitter and Flickr to conform to new LLHTTPClient interface. Fix merge error in Facebook connect as well 2014-06-17 15:12:31 -07:00
Merov Linden c4c8debfc2 Pull merge from lindenlab/viewer-release 2014-06-17 11:12:27 -07:00
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Merov Linden 8dae4bc222 Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile errors 2014-05-06 18:21:04 -07:00
Cho df26597c0d Added FB+SL friends list to Friends tab in Facebook floater for ACME-1334 2014-02-28 01:49:58 +00:00
Cho d80a812ffc Changed SLShare photo upload filename to Untitled for the sake of default Flickr title 2014-02-26 20:21:05 +00:00
Cho 968099312a fixed SLShare connection state issues for ACME-1298 2014-02-06 22:59:58 +00:00
Cho dea35b4bac Removed support for secondlife:///app/slshare for ACME-1263 2014-01-08 20:06:26 +00:00
Cho 19d482e913 Cleaned up some code while investigated ACME-1152 2013-12-18 23:18:02 +00:00
Cho e88c9909b6 Added highlighting to SLShare tabs for ACME-1177 2013-12-18 22:24:21 +00:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Merov Linden 0dfc7f6145 Pull merge from lindenlab/viewer-acme 2013-12-04 21:17:04 -08:00
Merov Linden a36c4f45b4 ACME-1043 : WIP : Add an argument to open trusted content with js and other enabled options, bypassing prefs 2013-12-04 18:02:04 -08:00
Cho 5a23bf50bc Added slshare SLapp support for ACME-1214 2013-12-05 00:29:12 +00:00
Merov Linden 6496e5877b Pull merge from viewer-acme 2013-12-03 11:53:31 -08:00
Richard Linden 17e9c872ad Automated merge with http://bitbucket.org/lindenlab/viewer-release 2013-11-11 19:17:49 -08:00
Richard Linden c4fc085f74 fixed some warnings 2013-11-06 18:16:57 -08:00
Cho 1a1826a4f7 separated web floaters for Facebook, Flickr, and Twitter to fix ACME-1151 2013-11-06 02:06:53 +00:00
Cho 181a7d2296 fixed backwards-compatibility with FBC SLURL for ACME-1154 2013-11-06 01:38:49 +00:00
Cho 0e71fb3c9d added Flickr floater for ACME-1136, ACME-1137, ACME-1138, ACME-1140, and ACME-1141 2013-11-02 01:50:17 +01:00
Cho 1b8b6e76bf added LLFlickrConnect for ACME-1116 2013-11-01 20:47:28 +01:00
Merov Linden a52fba0e48 ACME-1104 : Crash when getting a cap from an unset region. Extended ACME-1099 fix. 2013-10-30 16:12:02 -07:00
Merov Linden 542864f8ea ACME-1099 : Prevent possible crashes on get connect URL for Twitter and Flickr 2013-10-29 12:02:40 -07:00
Don Kjer 7866356d77 Merge viewer-release => sunshine-internal 2013-10-29 13:20:18 +00:00
Merov Linden 85b6aeb404 Pull merge from lindenlab/viewer-fbc 2013-10-28 17:25:18 -07:00
Merov Linden 3a57a67c5d ACME-1099 : Fix crash when getting the Facebook cap from a (potentially null) region 2013-10-28 17:15:57 -07:00
Cho 528f424952 temporarily added test call for FlickrConnect and TwitterConnect for ACME-1014 2013-10-09 00:32:31 +01:00
Merov Linden bf22b7150d ACME-905 : Get the FacebookConnect cap each time we need it (it's not that much) 2013-09-06 18:26:21 -07:00
Gilbert Gonzales 3ba9cf2048 ACME-789: Remove SLShareHost setting from settings.xml 2013-09-03 19:11:20 -07:00
Gilbert Gonzales ed828365b8 ACME-866 User receives error when hitting Disconnect in Facebook floater, if access token was cleared manually on backend: Problem was that when the user was already disconnected the Facebook connection state was not being set to disconnected. 2013-08-29 16:05:49 -07:00
Cho 4595978d59 removed momentary error message upon connecting to Facebook 2013-08-14 20:02:31 +01:00
Cho d0e964289e added read_from_master parameter for ACME-829 2013-08-13 01:47:20 +01:00
Gilbert Gonzales 481abb1381 ACME 824: Suggested Friends do not repopulate if you disconnect and reconnect to Facebook API in same viewer session 2013-08-09 18:31:10 -07:00
Gilbert Gonzales 3e08ccf6ab ACME-801: Adding a suggested friend as a friend does not remove them from the suggested friend list 2013-08-06 17:12:32 -07:00
Gilbert Gonzales c7342bc6c0 ACME-744: Adjusted comment to be more clear 2013-08-06 10:27:18 -07:00
Merov Linden 76aeb6ea70 Pull merge from lindenlab/viewer-fbc 2013-08-03 08:13:47 -07:00
Merov Linden 3527846196 ACME-796 : Do not flip the fbc state to failure while connecting through web browser. Handle the dismiss case as best as possible. 2013-08-02 19:25:10 -07:00
Gilbert Gonzales a4bad4ba21 ACME-744: Temporary solution. The internal browser was not setting keyboard focus properly...as to why an investigation is needed. For now explicly setting keyboard focus to the internal browser after it is displayed. 2013-08-02 18:58:37 -07:00
Merov Linden b19b2737b2 ACME-761 : Use the cap for the service url unless overridden by the SLShareHost setting from settings.xml 2013-08-01 21:46:37 -07:00
Merov Linden 571ce028fd Pull merge from lindenlab/viewer-fbc 2013-08-01 20:56:09 -07:00
Merov Linden 7bcda3a511 ACME-785 : Use a specific notifytip message (without the OK button) for fbc success notification 2013-08-01 20:53:27 -07:00
Gilbert Gonzales 1f6d19436e ACME: add SLShareHost variable to settings.xml, which allows changing the fb service host location as needed. 2013-08-01 15:12:58 -07:00
Gilbert Gonzales a2b1e06c3d ACME-778: Adjusted the facebook code so that isConnected() does not depend on state changes. Instead it returns true if the user successfully connected and false if the user successfully disconnected. 2013-07-31 19:04:45 -07:00
Gilbert Gonzales d0764f57a5 ACME-757: Switching back to pdp15 host for testing. 2013-07-31 13:03:57 -07:00
Merov Linden 85c8c1daf0 ACME-757 : Change the hard coded url to fbc service (still a hack) 2013-07-30 13:02:29 -07:00
Gilbert Gonzales 0254b74abf ACME-773 Remove the 'Use another account...' in the ACCOUNT panel 2013-07-25 16:04:58 -07:00
Gilbert Gonzales 91c8740c35 ACME-602 Remove logging code that reveals use of suggested friends 2013-07-24 17:17:19 -07:00
Gilbert Gonzales 66522bb6bd ACME-677 Make the 'Connect...', 'Disconnect' and 'Use another account...' buttons disabled upon clicking 2013-07-23 13:31:41 -07:00
Gilbert Gonzales 882b2508db ACME-729 Implement the 'Use another account...' button 2013-07-22 18:49:22 -07:00