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

307 Commits (025c8909582f59f68f786d52bea06f5a272df0b5)

Author SHA1 Message Date
Graham Madarasz 025c890958 Merge vwr-dev-mat 2013-05-01 08:11:15 -07:00
Graham Madarasz 70c1e21956 Fix gcc ternary type inference fail to unbreak Mac and Linux builds 2013-04-30 13:49:46 -07:00
Graham Madarasz 806d09b114 Merge 3.5.1 into Materials 2013-04-30 19:50:05 -07:00
Graham Madarasz d659b29f6c Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XML 2013-04-30 13:44:35 -07:00
Graham Madarasz fd447189c5 Merge 3.5.1 into Materials 2013-04-25 21:00:16 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Nyx Linden dbe504cbd4 SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objects 
Added protection for invalid / empty inventory contents
 2013-04-17 18:33:39 -04:00
Dave Parks f189ba4a3d NORSPEC-71 Lots more UI hookups 
Written with and Reviewed By Graham
 2013-04-03 16:56:59 -05:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
Brad Payne (Vir Linden) 5a436e46f6 SH-3959 WIP - pass information about type of fetched image - server bake, host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed 2013-03-08 17:07:17 -05:00
Oz Linden 64a4a13397 fix crasher in setNumTEs 2013-02-15 15:40:43 -05:00
Oz Linden 8bb3d0891d merge up to 3.4.5-release 2013-02-12 13:27:03 -05:00
Oz Linden 7cc7ae873c improve and clarify logging 2013-02-04 09:35:12 -05:00
Brad Payne (Vir Linden) c24c974cc6 SH-3800 WIP - logic to detect baked textures being sought in the wrong place, avoid querying textures for which we have no authoritative data where they live 2013-01-30 18:23:31 -05:00
Geenz aa1befd689 Specular map support. This is the vast majority of the material parameters implemented at this point for opaque geometry. 2013-01-30 12:17:04 -05:00
Geenz 66a01ba4c5 Basic normal mapping support. 2013-01-28 19:56:18 -05:00
Geenz 97f9ab80f9 setMaterialParams for LLViewerObject 2013-01-25 18:45:40 -05:00
Geenz 5f03e197f4 Trying to set materials up for rendering! Yay! 2013-01-25 17:54:38 -05:00
Nyx Linden 11fe124ae9 merging in viewer-beta. 
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
 2013-01-24 16:22:49 -05:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
William Todd Stinson ea0461c012 Pull and merge https://bitbucket.org/lindenlab/viewer-development. 2012-11-21 15:07:17 -08:00
William Todd Stinson 76990fab4f Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-13 17:17:41 -08:00
William Todd Stinson b10b7833ee MAINT-1755: Correcting behavior when llTargetOmega is called with zero spin rate. 2012-11-09 17:55:44 -08:00
William Todd Stinson ef26660c30 Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-09 16:44:49 -08:00
William Todd Stinson 45336ca20d MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fix these issues, but then was accidentally re-introduced during a bad merge. 2012-11-08 17:37:01 -08:00
Dave Parks c431ddf629 Automated merge with http://bitbucket.org/lindenlab/viewer-development 2012-11-08 13:05:29 -06:00
William Todd Stinson a4945f36de Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-06 12:30:32 -08:00
William Todd Stinson a91c2d889a Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-11-06 12:22:06 -08:00
Oz Linden 200f39e6a7 merge changes for DRTVWR-217 2012-11-05 16:27:20 -05:00
Kelly Washington 0cdff2817b Merge 2012-10-25 16:13:39 -07:00
William Todd Stinson f44340a6b4 MAINT-1672: Correcting issue where the sailboat boom was not moving correctly. The isssue was that the display text for the prim was being updated, and this code path would mark the prim as having been moved when, in fact, the pipeline had not yet moved the object. 2012-10-15 16:34:29 -07:00
simon@Simon-PC.lindenlab.com d6e3b0445a Merge in viewer-development code and fix build 2012-10-15 14:23:29 -07:00
William Todd Stinson 38a565f71a Initial pass at getting a list of viewer objects with non-null material IDs. 2012-10-09 12:30:38 -07:00
William Todd Stinson c6a2ac0489 Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179. 2012-09-20 19:43:54 -07:00
Dave Parks b4c8a982fc reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in LLViewerObjectList::update, fix for error in llpolymorph 2012-09-20 10:00:53 -04:00
Dave Parks c2d0531a0e reapply 71673401390a: MAINT-646 Knock out some extraneous performance timers 2012-09-20 09:56:36 -04:00
William Todd Stinson 225a3984cb MAINT-1561: BUGFIX Another target omega fix for an issue detected with a clock pendulum. 2012-09-13 12:22:09 -07:00
Oz Linden 1dd256f7a8 merge changes for DRTVWR-213 2012-09-11 10:20:06 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Don Kjer 2cb3b8ef6b Merge VirLinden/sunshine -> don_linden/sunshine-experimental 2012-09-05 18:36:50 +00:00
Don Kjer 9f6c845902 Merge viewer-development -> VirLinden/sunshine 2012-09-05 18:23:31 +00:00
Don Kjer 1f6e20c5bb Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture 2012-09-04 17:43:08 +00:00
Oz Linden e3b4b3875a merge changes for DRTVWR-207 2012-09-04 11:08:14 -04:00
MaksymS ProductEngine 608fa855b3 MAINT-1502 User is unable to rename script inside content of object: 
- regression after wrong merge, full fix was done in MAINT-1228;
 2012-09-04 12:37:51 +03:00
Oz Linden 8189b28d22 merge changes for 2012-08-31 16:28:24 -04:00
callum e4230e640a MAINT-1455 FIX Media Texture not visually updated correctly 
Reviewed by me. (Bao created)
 2012-08-29 11:16:22 -07:00
William Todd Stinson 7d54c71aeb MAINT-1480: Ensuring that the new angular velocity is remembered for later comparison to the previous angular velocity. 2012-08-27 19:26:58 -07:00