a9ea410035
Allow user to override either English, or localized, skinned file.
...
Original LLDir::findSkinnedFilenames() implementation used a tricky rule: a
given skin directory was only considered if it provided a default-language
override for the sought filename, regardless of whether it also provided
localizations for that filename. Discussion with Richard clarifies that we
want to allow the user to override neither, either or both. Change
findSkinnedFilenames() accordingly; update unit tests to verify new semantics.
2012-10-23 16:06:03 -04:00
8039c4583e
MAINT-1567 cleanup some gcc warnings
2012-10-23 14:31:34 -05:00
16c6b56ee4
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2012-10-23 13:36:20 -05:00
10697d59b6
MAINT-1567 Fix for incorrect triangle and hull counts in mesh importer.
...
Reviewed by VoidPointer
2012-10-23 13:35:11 -05:00
ae3e4fee37
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
2012-10-22 22:51:28 -07:00
50ad343366
SH-3405 WIP convert existing stats to lltrace system
...
added return value to serialize function to track if any values were written
2012-10-22 22:46:45 -07:00
d6634fcd24
SH-3405 WIP convert existing stats to lltrace system
...
sanitized param block code to accept isValid and isProvided at any point
added predicates to control serialization
2012-10-22 19:54:10 -07:00
682d7355fd
whitespace change to force new build in TC
2012-10-22 15:51:07 -07:00
07410567c0
LLDrawable::destroy: Illegal deletion of LLDrawable!
2012-10-22 21:39:48 +02:00
a5e2ef6042
correct faulty merge
2012-10-23 16:34:04 -04:00
4827b7160b
Enable tcmalloc
2012-10-22 14:39:29 -05:00
ece80f722e
Trying original version of GBP with new scripts/code- revert corresponding cpp code
2012-10-22 11:20:24 -07:00
08b7f100f6
Trying original version of GBP with new scripts/code
2012-10-22 11:03:34 -07:00
534e0ee051
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
2012-10-22 10:42:36 -07:00
d8a83466de
SH-3405 WIP convert existing stats to lltrace system
...
removed spam and dead code
2012-10-22 10:42:26 -07:00
486f80aae6
Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and CXXFLAG to have cmake generation debug symbols in xcode.
2012-10-20 19:47:36 +00:00
bfe85fb24b
SH-3405 WIP convert existing stats to lltrace system
...
fixed build
2012-10-20 10:46:57 -07:00
73cc2c6a7a
Adding expanded searching for symbols during google breakpad symbol scan
2012-10-20 09:46:59 +00:00
b9303e9e80
SH-3405 WIP convert existing stats to lltrace system
...
removed spam and dead code
2012-10-19 19:42:23 -07:00
176ffa54b4
SH-3405 WIP convert existing stats to lltrace system
...
finished most of conversion of llviewerassetstats
ported some param block fixes from viewer-chui
converted viewer asset stats to param block format
2012-10-19 19:35:01 -07:00
6dee3e638a
Trying explicitly turning on debug symbols for all mac configurations
2012-10-19 23:54:41 +00:00
e18d97782f
Turn off configs and tests for testingg
2012-10-19 16:45:40 -07:00
15cde616b9
Update to BuildParams var
2012-10-19 16:14:11 -07:00
6c7167b1f2
fix a gTextureTimer bug: it starts too early.
2012-10-19 17:00:29 -06:00
2d7eb08852
Turn off cleaning up post build for testing
2012-10-19 12:13:18 -07:00
1b0ea26ecb
merge back late fix for MAINT-1753
2012-10-19 14:19:22 -04:00
f2a674274f
Added tag 3.4.1-beta9 for changeset 637fe8bbee5e
2012-10-19 14:07:05 -04:00
246d2b9476
merge changes for DRTVWR-233
2012-10-19 14:06:55 -04:00
04a16d2836
tag merge of DRTVWR-233
2012-10-19 14:06:50 -04:00
1d3487e2ea
pull back changes from 3.4.1-beta9
2012-10-19 13:38:57 -04:00
c8fcb6c798
Added tag 3.4.1-beta9 for changeset 9c4519aa5c70
2012-10-19 11:33:24 -04:00
f71d2a649b
tag merge of DRTVWR-231
2012-10-19 10:31:11 -04:00
bd52d784f9
SH-3405 WIP convert existing stats to lltrace system
...
created param block skeleton for asset stats
removed most of llviewerassetstats logic
2012-10-18 23:53:37 -07:00
11017315e6
MAINT-1753: Correcting behavior of ll_aligned_realloc_16() on Linux to avoid memory corruption in the case that the new memory size requested is smaller than the old memory size. Also, adding check to ensure that the aligned malloc returns a non-null value before memcopying.
2012-10-18 17:36:57 -07:00
1fadd6138e
SH-3405 WIP convert existing stats to lltrace system
...
fixed trace recording on background threads hitting null pointer
2012-10-18 17:32:44 -07:00
64912f9e49
Removing GCC_GENERATE_DEBUGGING_SYMBOLS=NO from xcode project
2012-10-18 16:31:24 -07:00
4936ce7782
Removing -g flag from mac builds
2012-10-18 16:23:31 -07:00
88fb47bf84
merge
2012-10-18 15:34:43 -07:00
48b2dbcd65
MAINT-1615 - Something invisible pushes avatars around on Dore
2012-10-18 15:11:22 -07:00
9cc1dfd4e6
MAINT-1303 FIXED Hide menus and buttons after exiting mouselook if 'Hide all controls' is switched on.
2012-10-18 18:58:55 +03:00
a52d203a4f
SH-3405 WIP convert existing stats to lltrace system
...
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
2012-10-17 20:00:07 -07:00
5bf755ba01
Adding '-g' to mac builds
2012-10-17 17:11:13 -07:00
19f25eea3d
merge
2012-10-17 16:44:37 -07:00
ab38c854c3
MAINT-1724 : Viewer crashes while attempt to open '+ inventory' floater
...
that already opened in separated floater. Changed to non-tearable menu.
Reviewed by Kelly
2012-10-17 16:43:56 -07:00
5a2f71b0bc
MAINT-1527 Fix for crash on exit when VBO disabled
2012-10-17 18:18:06 -05:00
814c875a25
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-10-17 16:09:25 -07:00
9d701e563b
MAINT-1742 Child object does not update position while selected.
...
reviewed with Davep
2012-10-17 14:05:14 -07:00
c8d58f8db3
Update script that generates Google Breakpad symbols to look in tghe right place first and default to the original location if not found.
2012-10-17 13:51:53 -07:00
2e30d65210
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2012-10-17 15:33:20 -05:00
2fd843c118
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
Nat Goodspeed