Aura Linden
|
efdcf045b0
|
Merged in from viewer-development.
|
2012-08-17 08:07:15 -07:00 |
|
Oz Linden
|
97106c2dea
|
merge changes for DRTVWR-194
|
2012-08-15 17:07:10 -04:00 |
|
simon@Simon-PC.lindenlab.com
|
83f5d0c616
|
Merge in viewer-development
|
2012-07-31 15:42:02 -07:00 |
|
Brad Payne (Vir Linden)
|
58d5e223b8
|
merge
|
2012-07-30 15:02:02 -04:00 |
|
Brad Payne (Vir Linden)
|
a5c9d89b28
|
merge
|
2012-07-30 14:57:33 -04:00 |
|
Aura Linden
|
a1d0268893
|
Minor improvement to identifying gl lib to use. Should use xcode version.
|
2012-07-24 16:52:33 -07:00 |
|
Oz Linden
|
8df3619621
|
merge to viewer-developmento
|
2012-07-24 10:51:37 -04:00 |
|
Todd Stinson
|
4feef5af63
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
|
2012-07-23 19:21:34 -07:00 |
|
Xiaohong Bao
|
afcc61a07a
|
fix for SH-3238: Textures are loaded at lower detail on subsequent log-ins
|
2012-07-19 15:31:33 -06:00 |
|
Aura Linden
|
35eda06ae4
|
llglheader include change for building on Lion
|
2012-07-18 17:35:10 -07:00 |
|
Oz Linden
|
509408f393
|
merge back beta fixes for DRTVWR-180
|
2012-07-14 09:30:09 -04:00 |
|
simon@Simon-PC.lindenlab.com
|
56d563ba7f
|
Fix merge issues - duplicate insertions of code
|
2012-07-11 17:14:25 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
173d0fa213
|
Pull in viewer-development because it's painful. Merge with runitai's help.
|
2012-07-11 16:15:23 -07:00 |
|
Dave Parks
|
e86b1c18db
|
MAINT-794 Fix for assert on loading some types of objects before their parents.
|
2012-07-11 15:17:13 -05:00 |
|
Dave Parks
|
997b360747
|
MAINT-794 Fix for assert on loading some types of objects before their parents.
|
2012-07-11 15:17:13 -05:00 |
|
Dave Parks
|
d1c056beba
|
MAINT-685 Fix for disabling basic shaders making high detail terrain render incorrectly.
|
2012-07-03 14:35:08 -05:00 |
|
Dave Parks
|
bedbbf7c02
|
Merge
|
2012-06-28 16:32:54 -05:00 |
|
Dave Parks
|
ed72fd0ae9
|
merge
|
2012-06-28 13:22:04 -05:00 |
|
Todd Stinson
|
fa562d19cf
|
Removing unreferenced methods from the LLRenderNavPrim class.
|
2012-06-27 18:12:57 -07:00 |
|
Todd Stinson
|
78910cf301
|
Updating the header licensing comments.
|
2012-06-26 18:04:19 -07:00 |
|
Brad Payne (Vir Linden)
|
74d4f8af01
|
v-r to drano merge conflicts wip
|
2012-06-26 16:43:58 -04:00 |
|
Todd Stinson
|
6e710333e7
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
|
2012-06-22 18:59:31 -07:00 |
|
Dave Parks
|
28ccf4190e
|
MAINT-653 Fix for shadow acne at high altitudes
|
2012-06-22 17:31:46 -05:00 |
|
Dave Parks
|
9e9d32de38
|
merge
|
2012-06-22 14:04:33 -05:00 |
|
Oz Linden
|
4397516ca5
|
merge changes for DRTVWR-168
|
2012-06-21 17:50:41 -04:00 |
|
callum
|
2eedd0c3c0
|
Merge with tip
|
2012-06-15 13:00:49 -07:00 |
|
Dave Parks
|
b93a23aa82
|
MAINT-1147 Fix for frame stall on region crossing.
|
2012-06-13 18:05:56 -05:00 |
|
Brad Payne (Vir Linden)
|
6ee0456220
|
merge
|
2012-06-04 15:28:08 -04:00 |
|
Aura Linden
|
0fd3ff972d
|
MAINT-1142 use VBO pooling on OSX
|
2012-06-04 12:15:08 -07:00 |
|
Dave Parks
|
67221663fe
|
MAINT-616 Fix for mac build.
|
2012-05-30 14:55:34 -05:00 |
|
Dave Parks
|
2e26dc3971
|
Minor instrumentation tweaks -- add a couple of asserts, a timer, and fix VBO accounting.
|
2012-05-30 13:22:04 -05:00 |
|
Dave Parks
|
e3a5125b41
|
MAINT-616 Potential fix for corrupted mip maps.
|
2012-05-25 17:58:12 -05:00 |
|
simon@Simon-PC.lindenlab.com
|
1777fa5187
|
Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148
|
2012-05-25 15:07:22 -07:00 |
|
Dave Parks
|
abaf0155b4
|
MAINT-616 Faster issuance of occlusion queries.
|
2012-05-25 10:51:38 -05:00 |
|
Dave Parks
|
efda0814cb
|
MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback.
|
2012-05-24 10:50:48 -05:00 |
|
Dave Parks
|
78df56e1b5
|
MAINT-616 Fix for crash on teleport from previous changes
|
2012-05-22 13:49:52 -05:00 |
|
Oz Linden
|
7637acf76e
|
merge changes for DRTVWR-149
|
2012-05-22 06:03:42 -04:00 |
|
Dave Parks
|
534168c452
|
MAINT-616 Fix for crash on shutdown caused by previous changes.
|
2012-05-22 00:49:07 -05:00 |
|
Dave Parks
|
b7cfd8c7f0
|
MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update
|
2012-05-21 23:33:25 -05:00 |
|
Kitty Barnett
|
1300f77fdd
|
Merged with viewer-beta
|
2012-05-20 17:41:00 +02:00 |
|
Dave Parks
|
89b0b6ac71
|
MAINT-616 Different VBO Pooling scheme -- populate VBO pool with buffers that are likely to be requested, but never reuse a previously used buffer.
|
2012-05-15 16:42:04 -05:00 |
|
Kitty Barnett
|
34e7226ac8
|
STORM-276 FIXED Squiggles overflow line editor height when font size is set to large
- Also reduced squiggle width from 6 to 4 and prevented running past the end of a word
|
2012-05-15 13:13:44 +02:00 |
|
Dave Parks
|
c946408519
|
MAINT-586 Starting logging OpenGL version and shader level to simulator
|
2012-05-11 14:42:29 -05:00 |
|
Brad Payne (Vir Linden)
|
678864e4ed
|
merge viewer-release to drano
|
2012-05-02 13:00:59 -04:00 |
|
Xiaohong Bao
|
da29210ed6
|
fix a sculpt crash
|
2012-05-01 21:29:19 -06:00 |
|
Xiaohong Bao
|
164de6c180
|
fix for a crash on sculpt
|
2012-04-27 18:32:42 -06:00 |
|
Nat Goodspeed
|
78f2663c4a
|
Automated merge with http://hg.secondlife.com/viewer-release
|
2012-04-26 14:04:55 -04:00 |
|
Adam Moss
|
9ce481a5ac
|
STORM-1819: Ternary/graded shadow support
Coalesced patchset.
|
2012-04-21 17:35:50 +01:00 |
|
prep
|
31543e637b
|
Fixed default character width bug. Updated rendertri api for new path rendering bookends.
|
2012-04-10 14:34:28 -04:00 |
|
Todd Stinson
|
3d9374d1fd
|
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-pf-xray.
|
2012-04-05 12:16:42 -07:00 |