Commit Graph

28685 Commits (e2a7280918665222db3357a4d7566dbdc5d959f2)

Author SHA1 Message Date
Merov Linden e2a7280918 ACME-582 : Checkin feature: Implement the loading and displaying of map tiles in the LLIconCtrl 2013-06-24 17:01:10 -07:00
Merov Linden 37fcb81c4a ACME-497 : Clean up the xml code for checkin to use a proper icon widget and add a decent default image for it 2013-06-24 13:32:13 -07:00
Merov Linden 27bd181a6d ACME-497 : Working implementation of Checkin though couple of bugs to fix and no visible map in the UI 2013-06-23 12:15:21 -07:00
Merov Linden b403f0f849 Pull merge from lindenlab/viewer-fbc 2013-06-22 11:53:58 -07:00
Merov Linden 9debe1787f ACME-497 : All xml work for the Checkin feature 2013-06-22 11:49:36 -07:00
Cho fc33dadc13 tweaked numbers to look more like mockup for ACME-568 2013-06-22 01:32:15 +01:00
Cho 835ea6dcae added text and buttons for update status tab for ACME-568 2013-06-22 01:23:14 +01:00
Gilbert Gonzales ba8bced90b ACME-588 Make 'Post' button post to facebook: Intial commit is just adding callback for clicking the post button 2013-06-21 12:45:20 -07:00
Gilbert Gonzales 824a5c65f5 ACME-584: Adjusted name of a couple XUI elements. 2013-06-20 17:58:27 -07:00
Gilbert Gonzales 988eae3698 merge 2013-06-20 16:40:43 -07:00
Gilbert Gonzales 50bb863be1 ACME-584 Create the panel to contain the image details 2013-06-20 16:39:08 -07:00
Merov Linden 7da4c65191 Pull merge from lindenlab/viewer-release 2013-06-19 14:06:06 -07:00
Gilbert Gonzales f1e594fece ACME-561 Left justified the tabs per UX 2013-06-19 10:18:40 -07:00
Oz Linden 2655c7a17a merge increment of version number 2013-06-19 09:00:45 -04:00
Oz Linden dd574045c4 correct 3.6.0-release for last minute fix 2013-06-19 09:00:00 -04:00
Oz Linden 519d95cee2 commit inital tag for 3.6.0-release 2013-06-19 08:59:10 -04:00
Gilbert Gonzales 387677ddb4 merge 2013-06-18 18:56:56 -07:00
Gilbert Gonzales a88be82d27 ACME-561 Adjusted the size of the floater to better match spec. Also made the floater non-sizable and the tabs spread nearly evenly across. Can touch up UI in another iteration and after some feedback. 2013-06-18 18:56:17 -07:00
Cho d1d495870a updated viewer to use new /friends route for ACME-534 2013-06-19 01:36:23 +01:00
Gilbert Gonzales 0a119a3dc9 ACME-561 Create tabs for the status, photo and place 2013-06-18 17:00:16 -07:00
Gilbert Gonzales 8748fdf77c CHUI 560: Missed adding floater_social.xml file 2013-06-18 11:00:30 -07:00
Oz Linden 1eb20a8522 correct banding issue 2013-06-18 13:21:27 -04:00
Oz Linden cb5289e02a remove files incorrectly brought back from the past by merges 2013-06-18 12:31:54 -04:00
Gilbert Gonzales 1643c4daca CHUI 560: When Me->Post to Facebook... is selected the Facebook floater opens. 2013-06-17 18:30:36 -07:00
Gilbert Gonzales 2e2015dc57 CHUI 560: Adding socialpanel.h/cpp files 2013-06-17 17:22:44 -07:00
Gilbert Gonzales 041de2ee85 merge 2013-06-17 14:59:27 -07:00
Gilbert Gonzales efa555cc5c ACME-558: Adding logging information, when a friends list is received the log message 'Facebook: Friends list received' will be displayed. When the suggested friends list is updated the log message 'Facebook: Updating Suggested Friends List' will be displayed. 2013-06-17 14:59:03 -07:00
Merov Linden 3910ce512f Merge with viewer-fbc 2013-06-14 20:11:14 -07:00
Merov Linden 2eb466908e ACME-520 : Add more extended state in LLFacebookConnect and handle it consistently and transparently from the public interface 2013-06-14 20:01:33 -07:00
Gilbert Gonzales 37dcc33532 ACME-558 Update LLPanelPeople to use the friends list callback and remove the timer dependencies 2013-06-14 16:07:03 -07:00
Oz Linden 1e41b017e1 increment viewer version to 3.6.1 2013-06-14 18:49:52 -04:00
Oz Linden 9b17747706 Added tag 3.6.0-release for changeset 69429d81ae4d 2013-06-14 18:49:18 -04:00
Graham Linden 0a61606b79 NORSPEC-251 fix issues with binding unloaded standard bumpmaps 2013-06-14 14:39:18 -07:00
Graham Linden f04e9363b9 NORSPEC-266 fix issues with observer feedback on edits of material map parameters 2013-06-14 09:41:33 -07:00
Graham Linden fec6ab591e Disable asserts in CalculateTangentArray (discussed with davep) to avoid debugging interruptions from bad assets 2013-06-14 09:32:23 -07:00
Gilbert Gonzales f5fb235aac ACME-537: Prevented error code for showing up when disconnected from FB and opening the 'Friends' tab of the people panel. 2013-06-13 16:57:04 -07:00
Graham Linden 8d35d9ee2f NORSPEC-250 speculative stab in the dark 2013-06-13 15:58:20 -07:00
Graham Madarasz 8c41ff72ac Fix ternary use found illegit in the eyes of GCC 2013-06-13 10:52:30 -07:00
Graham Madarasz 6583bfe262 Merge vwr-dev-mat 2013-06-13 08:59:42 -07:00
Oz Linden 1f2125cc12 correct DOS line endings 2013-06-13 11:45:54 -04:00
Graham Madarasz 98d2a434db NORSPEC-263 replaced dropped deg to rad conversion between UI and material update 2013-06-13 08:23:40 -07:00
Graham Madarasz ac018153cb MAINT-2632 speculative guards in display_startup based on prevalence of crashes ending there (no repro, unfortunately) 2013-06-13 07:57:22 -07:00
Graham Madarasz 8ad2c0b8fb NORSPEC-260 fix issues with OK after pressing none being intepreted as add a null normal map 2013-06-12 15:01:23 -07:00
Graham Madarasz b60ea52902 NORSPEC-251 fixed and 258 not regressed 2013-06-12 14:08:16 -07:00
Graham Madarasz 3eb460f772 Remove NaN guards from vopartgroup and volume code 2013-06-12 12:25:30 -07:00
Graham Madarasz 88553c9eb1 Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8 2013-06-12 12:19:48 -07:00
Graham Madarasz b070bb1c22 Merge 2013-06-12 10:28:14 -07:00
Graham Madarasz 9726f3774d Backout tangent assert experiment 2013-06-12 10:26:06 -07:00
Graham Madarasz 1a37ea3671 Pedantic adj overly concerned with minute details or formalisms 2013-06-12 09:38:04 -07:00
Graham Madarasz d2b253f1f6 Changes to protect against use of normalize3fast on degenerate vectors 2013-06-12 09:16:19 -07:00