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

792 Commits (ebdc7c29c81d14235eb23d18a63ea0bbd3eb3cdf)

Author SHA1 Message Date
Tank_Master 718f6fa0ff merge LL 3.6.1 2013-07-10 00:23:23 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Tank_Master 14001c54df Gastly CHUI merge pass 1, don't count on anything to work. 2013-06-26 12:14:54 -07:00
Dave Parks c3f14b915c NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric) 2013-06-03 12:50:48 -05:00
Serpentu c3804fd041 MATBUG-8: fix local texture support for normal and specular maps 2013-05-24 11:47:06 -04:00
Oz Linden 5758b9e304 merge changes for 3.5.3-release 2013-05-22 11:09:43 -04:00
Oz Linden 2df5b9caa6 BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid. 2013-05-21 17:25:51 -04:00
Dave Parks 46eface63c NORSPEC-181 Fix for performance regression. 2013-05-14 16:20:54 -05:00
Oz Linden 4d22c32aa9 merge changes for 3.5.2-beta4 2013-05-10 10:56:40 -04:00
Oz Linden 1b984d8f40 merge changes for 3.5.1-release 2013-05-08 14:46:00 -04:00
Oz Linden bfb1ab134f merge changes for 3.5.1-beta3 2013-04-23 14:29:24 -04:00
Nyx Linden 06d7845a5a SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special characters. 
Integrated Nicky Dasmijn's patch to handle the unicode file paths properly.
Code reviewed, patch was clean.
Tested locally, correctly allows wearables to load where they would fail before.
Should be ready for automated build & QA.
 2013-04-22 19:14:24 -04:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Oz Linden ed2b5da8f1 merge changes for DRTVWR-298 2013-04-18 14:55:28 -04:00
Nyx Linden 490edf41eb BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker 
Added checks to validate that the selection list is non-empty
 2013-04-17 19:20:42 -04:00
callum_linden 88eff41649 Merge with viewer-development 2013-04-17 13:38:04 -07:00
Oz Linden 2fde4a9ae5 merge changes for 3.5.0-beta7 2013-04-01 14:24:01 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
merov_linden e5aa9088f0 CHUI-810 : Merged Marine Kelley's patch on selected text and use of return key in chat 2013-03-11 14:59:53 -07:00
Graham Madarasz (Graham) 2ea750ebca For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934. 2013-03-05 13:47:02 -08:00
callum_linden 010c87788d Merge with HEAD 2013-02-15 10:15:58 -08:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
callum_linden bfffedaec9 Trivial whitespace change to ignite new Team City build after some admin work 2013-02-06 15:09:44 -08:00
callum_linden 5766592712 Updated contributions text file with people who worked on the FMOD upgrade patch 2013-02-06 13:57:51 -08:00
Whirly 0908b60c1c STORM-1930 Quality & Speed slider has Ultra label where High should be. 2013-02-01 08:10:16 +00:00
Jonathan Yap 30b48351f9 OPEN-161 Typo in the header guard. 2013-01-16 19:19:19 -05:00
Dave Parks 954ebaed84 Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2013-01-08 13:40:59 -06:00
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Dave Parks 2fd843c118 MAINT-873 Fix for inability to upload meshes on some systems. 2012-10-17 15:33:01 -05:00
Dave Parks 378e9528d4 MAINT-873 Fix for inability to upload meshes on some systems. 2012-10-17 15:33:01 -05:00
Dave Parks 9db74ae962 MAINT-1138 Fix for crash when picking rigged attachments. 2012-10-09 18:27:42 -05:00
Dave Parks 6c989a692d MAINT-1138 Fix for crash when picking rigged attachments. 2012-10-09 18:27:42 -05:00
Oz Linden 185169cbbe correct attribution for STORM-1868 (add Wolf Loonie) 2012-11-15 11:29:38 -05:00
Nat Goodspeed 695c4135ff Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased 2012-09-07 14:47:24 -04:00
Dave Parks af6e665d5c MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS X 2012-09-07 11:22:45 -05:00
Oz Linden 43d29ea03e merge changes for DRTVWR-202 2012-08-22 17:11:10 -04:00
Oz Linden 0c903609d4 merge changes for storm-1895 2012-08-16 10:55:31 -04:00
Oz Linden 39d79080c0 merge changes for storm-1899 2012-08-16 10:33:42 -04:00
Oz Linden df93749819 merge up to latest viewer-development 2012-07-31 14:55:15 -04:00
Ansariel 08f35b6a14 STORM-1899: Avatar hand poses randomly get stuck in spread position 2012-07-26 17:07:12 +02:00
callum_linden 78854c9baa Fix to build with code signing option (patch from STORM-1900) 2012-07-25 16:42:37 -07:00
Tank_Master 097900fcbb Merge LL 3.4.5 beta 5 2013-02-05 19:03:17 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Cinders 569f9cf88a Pull in STORM-1921, STORM-1927, STORM-1928: improved Dof, SSAO, and Fog fixes by Tofu Buzzard 2013-01-20 07:18:35 -07:00
Tank_Master cc44316aed Merge LL 3.4.3, 
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
 2012-12-18 00:36:35 -08:00
Tank_Master 5b5f4c8bf5 Merge LL 3.4.2 release, 
broken revision, KDU package needs updating, mac packager also likely broken
 2012-12-14 07:59:55 -08:00
Cinders 9f3f74aa53 FIRE-8338: Edge-on prim rotation snaps when snap is disabled - Submitted by Cron Stardust 2012-11-25 22:02:27 -07:00
Oz Linden 764d1e3caf merge up to 3.3.3-release 2012-06-28 10:35:22 -04:00
Whirly b4e1d03584 STORM-1895 - Rename Delay Restart button to Cancel Restart 2012-06-26 15:37:31 +01:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00