Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
prep
|
207d9fd767
|
Viewer-chui merge
|
2013-03-11 14:45:53 -04:00 |
|
Merov Linden
|
faae38daaa
|
Pull merge from lindenlab/viewer-developement
|
2013-01-30 20:01:03 -08: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 |
|
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
|
be0406bffd
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-10-31 10:52:54 -07:00 |
|
William Todd Stinson
|
9da9b2d84b
|
Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.
|
2012-10-17 14:32: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 |
|
Dave Parks
|
cdbfdfc351
|
MAINT-1709 Factor out realloc
Reviewed by VoidPointer
|
2012-10-11 17:02:45 -05:00 |
|
Dave Parks
|
7ebbb5067d
|
MAINT-1709 Factor out realloc
Reviewed by VoidPointer
|
2012-10-11 17:02:45 -05:00 |
|
Oz Linden
|
1709952adb
|
pull back 3.4.1-beta6 fixes
|
2012-10-10 21:40:10 -04:00 |
|
Don Kjer
|
c06c35609c
|
Updating linux build to gcc4.6
|
2012-10-11 00:09:04 +00:00 |
|
William Todd Stinson
|
4a3bdb6896
|
Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179.
|
2012-10-10 15:10:48 -07:00 |
|
Dave Parks
|
bc0abc7734
|
Fix up some assertions in lloctree.h
|
2012-10-02 12:11:42 -05:00 |
|
Dave Parks
|
b5e71964e5
|
reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.
|
2012-09-20 10:00:56 -04:00 |
|
Dave Parks
|
683c43c2e0
|
reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.
|
2012-09-20 10:00:55 -04:00 |
|
Dave Parks
|
6a09bc187c
|
reapply 0f20bb7cb9ee: MAINT-1147 Don't rebuild volume meshes on region crossing.
|
2012-09-20 09:48:56 -04:00 |
|
Dave Parks
|
cf98064700
|
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
|
2012-09-20 09:48:55 -04:00 |
|
Dave Parks
|
5c3c556e94
|
reapply 4f8ca653a394: Fix for linux build.
|
2012-09-20 09:48:52 -04:00 |
|
Dave Parks
|
1ba00693c7
|
reapply 38b7779af5f9: MAINT-646 Faster traversal of render batch lists.
|
2012-09-20 09:48:51 -04:00 |
|
Oz Linden
|
97d969a338
|
initial attempt to restore changes that make removing tcmalloc possible; not tested
|
2012-09-12 14:36:37 -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 |
|
Nyx (Neal Orman)
|
77b33d9623
|
SH-3264 Porting over the XML loading of the avatar structure to llappearance
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
|
2012-09-07 23:17:34 -04:00 |
|
Oz Linden
|
1a872c7bf8
|
pull back changes from 3.4.1-beta11
|
2012-10-30 14:34:05 -04:00 |
|
Don Kjer
|
1f6e20c5bb
|
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
|
2012-09-04 17:43:08 +00:00 |
|
MaksymS ProductEngine
|
d1481a599f
|
MAINT-1486 FIXED Crash on login (Unhandled exception)
|
2012-08-31 00:38:16 +03:00 |
|
Todd Stinson
|
268d5bd4bd
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.
|
2012-08-09 17:04:00 -07:00 |
|
Todd Stinson
|
9488baada3
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
|
2012-08-09 12:06:09 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
83f5d0c616
|
Merge in viewer-development
|
2012-07-31 15:42:02 -07:00 |
|
Todd Stinson
|
3e038cd71b
|
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
|
2012-07-27 12:53:54 -07: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 |
|
simon@Simon-PC.lindenlab.com
|
b7555a3309
|
Merge back viewer-lion, which has viewer-development and down-stream fixes
|
2012-08-01 14:07:24 -07:00 |
|
Dave Parks
|
4a5ad35793
|
MAINT-570 Remove unused memory tracking system LLMemType
|
2012-07-20 11:42:15 -05:00 |
|
Dave Parks
|
bedbbf7c02
|
Merge
|
2012-06-28 16:32:54 -05:00 |
|
Dave Parks
|
39ee498af0
|
MAINT-678 Fix for inconsistent data in physics shape display
|
2012-06-28 15:47:18 -05:00 |
|
Dave Parks
|
ed72fd0ae9
|
merge
|
2012-06-28 13:22:04 -05:00 |
|
Oz Linden
|
2c3e78f1f1
|
merge changes for DRTVWR-167
|
2012-06-27 14:18:22 -04:00 |
|
Brad Payne (Vir Linden)
|
ba4c4bcbd1
|
merge
|
2012-06-22 15:53:28 -04:00 |
|
Dave Parks
|
9e9d32de38
|
merge
|
2012-06-22 14:04:33 -05:00 |
|
callum
|
2eedd0c3c0
|
Merge with tip
|
2012-06-15 13:00:49 -07:00 |
|
Dave Parks
|
93fcff2b24
|
MAINT-646 Cleanup some warnings from previous changes.
|
2012-06-14 14:54:54 -05:00 |
|
Dave Parks
|
b93a23aa82
|
MAINT-1147 Fix for frame stall on region crossing.
|
2012-06-13 18:05:56 -05:00 |
|
Dave Parks
|
87c4d45f5f
|
MAINT-1147 Don't rebuild volume meshes on region crossing.
|
2012-06-06 17:13:45 -05:00 |
|
Dave Parks
|
92ee373e45
|
MAINT-646 Factor std::set out of lloctree
|
2012-06-05 12:55:17 -05:00 |
|
Dave Parks
|
02a88f42a2
|
Fix for linux build.
|
2012-06-01 15:50:56 -05:00 |
|
Dave Parks
|
096fe03786
|
MAINT-646 Faster traversal of render batch lists.
|
2012-06-01 14:27:04 -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 |