ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
998c31ef9e
BUILDFIX fixing undefined reference in build
2013-02-26 15:29:23 -05:00
354ccc1640
additional safety check for bad appearance messages
2013-02-15 13:44:21 -05:00
72dfb2abce
SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and sb system is unavailable, to avoid stale appearance problems
2013-02-13 17:28:05 -05:00
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
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
8ba2b38876
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-13 10:25:48 +00:00
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
6ae4802e6d
merge
2012-07-30 19:10:46 -04:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
8df3619621
merge to viewer-developmento
2012-07-24 10:51:37 -04:00
833d73d674
fix for SH-3235: Bump maps are not loaded until objects change LOD
2012-07-13 17:46:43 -06:00
409be9dcc4
SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates
2012-07-13 16:59:57 -04:00
27c7b259b4
SH-3267 WIP
2012-07-12 18:24:23 -04:00
90fdf60d69
PATH-807: Adding an additional check for if the object is marked as volume-detect. Note that this will require Andrew's corresponding server-side change to take effect. However, the viewer change alone should have no neative effect prior to the server being updated.
2012-07-12 14:12:58 -07:00
702e6815ed
partial changes for building with the llphysicsextensions source package
2012-07-05 12:16:48 -04:00
b7555a3309
Merge back viewer-lion, which has viewer-development and down-stream fixes
2012-08-01 14:07:24 -07:00
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
e4a0dda457
SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards
2012-06-28 14:24:04 -04:00
cbebd682f7
Removing windows line endings from .h and .cpp files.
2012-04-25 13:04:13 -07:00
1cdef4903d
Updating to the latest llphysicextensions pre-built package with the now lowercased version of the header file names.
2012-04-18 16:03:33 -07:00
3d237bd242
PATH-199: Starting to introducing the pathfinding flags for the object.
2012-02-29 14:41:47 -08:00
894d79e4ec
PATH-199: More cleanup of object flags and syncing with definitions from the server-side using left-shifted bits instead 0x explicits for better human readability.
2012-02-29 12:34:28 -08:00
07545e99fc
SH-2689 FIX - a bit more logging and related cleanup. Somewhat arbitrarily calling this done, although tweaks will be ongoing
2012-02-29 13:09:28 -05:00
4d77d3cca1
PATH-199: Cleaning up code related to object flags so that I can better use the flags to managed pathfinding flags such as permanent and character.
2012-02-28 19:07:44 -08:00
a0bab1952b
BUILDFIX header file capitalization
...
Will clean this up to be more in line with our standards later
2012-01-27 16:12:50 -05:00
0b16411d30
assert fix for mempyNonAliased16 call
2012-01-26 14:07:37 -05:00
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
472928043a
merge
2011-11-29 14:43:48 -06:00
d089e6c264
bumped up MSVC warning level to 3 to catch more stuff that gcc catches
2011-11-28 19:16:49 -08:00
2851cd5193
a try fix for sh-2651: [crashhunters] Crash after google translate failure
...
and sh-2658: crash in LLPluginMessage::parse
2011-11-28 11:33:49 -07:00
c69785f0b5
SH-2449 Preserve texture scaling when animating textures when "size x" and "size y" parameters to llSetTextureAnim are zero.
2011-11-23 12:05:24 -06:00
7d6ea9814e
ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewed
...
by Kelly
2011-09-27 09:32:36 -07:00
4b269f67ea
merge
2011-09-14 14:54:20 -04:00
2df669c402
Log error message if material list is not a subset of reference model
2011-08-30 10:46:41 -04:00
71ac45a28b
Handling of material mismatches - lod materials are required to be a subset of the high lod, introduced addEmptyFace() for when parity does not exist between model material counts
2011-08-30 09:32:16 -04:00
4b2ba7236f
Merge from viewer-experience
2011-08-22 11:41:18 -07:00
af8864c49c
merge
2011-08-19 09:41:50 -04:00
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
10ec004912
merge from viewer-experience
2011-08-12 14:53:25 -07:00
6732f5fbca
merge viewer-development to mesh-development
2011-08-10 17:53:11 -04:00
df94d0c778
Fixes for sh-2039, sh-1336, and sh-2044. Vertices were having incorrect weights assigned.
2011-08-03 17:01:34 -04:00
fdcf43e0b3
merge
2011-07-29 17:50:20 -04:00
c013c3ab53
Removed joint Positional Compare because it was crashing on some rigs
2011-07-29 17:44:42 -04:00
0713e8c97a
BUILDFIX: fixing build for linux, casting doubles as parameters to abs
2011-07-29 17:21:27 -04:00
9d44be1903
merging in PE's fixes for new UI to mesh-development.
...
Included are upload floater tweaks, build panel tweaks,
and removing the mesh enabled checkbox in region tools.
2011-07-29 15:56:51 -04:00
7fc12cd43d
Fix for sh-2044, sh-2039 and sh-2166 (Avatar weights were sometimes not correctly applied upon import.
2011-07-28 16:09:17 -04:00
50b9c63382
SH-1868 WIP Added user-supplied metric data for uploading a model.
...
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests.
The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
2011-07-22 22:40:18 +03:00
Oz Linden