6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
a72e34a345
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
0c60e32808
Merge
2013-10-21 16:57:38 -06:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
0e116741a0
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
b5ec05f9d9
Revert SH-4050 which causes the avatar to be shoved into the ground under certain circumstances
2013-12-28 14:29:44 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07:00
95037bdefe
MAINT-3336 : double calls to deleteAndClear() in LLAvatarAppearance destructor
2013-10-21 15:10:05 -07:00
e43058e764
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
075a7bcc98
SH-4297 WIP interesting: viewer-interesting starts loading cached scene late
...
dependency cleanup - removed a lot of unecessary includes
2013-07-18 15:09:45 -07:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
88553c9eb1
Cleanup rollback and try point MIPs experiment to see if that's what is hosing the Mac on 10.6.8
2013-06-12 12:19:48 -07:00
d2b253f1f6
Changes to protect against use of normalize3fast on degenerate vectors
2013-06-12 09:16:19 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c38204f5e0
Unwind cruft from hunting for 2707 they won't end up in vwr-dev-mat
2013-06-05 14:26:27 -07:00
ea24612561
BUG-2707 make use of OsOutputDebugString _DEBUG only on Windows to avoid throwing unhandlable exceptions in coroutines in RelWithDebInfo builds
2013-06-04 07:51:27 -07:00
cf3d2a06a1
BUG-2707 turn off more LL_DEBUGS to narrow down Kat's crashing cuplrit
2013-06-01 19:36:38 -07:00
d21fc254a7
BUG-2707 hunt for infos call crashing Kat
2013-06-01 13:43:52 -07:00
08bd67c0dd
SH-4059 FIX other's hover parameters affects your avatar's setting
...
Added an additional sanity check to make sure that other avatars don't
affect your wearables.
2013-04-04 11:38:23 -04:00
b724791c2a
SH-4050 FIX camera goes below ground when avatar offset set to 0
...
Added a constraint to ensure that the avatar's height (with offset)
does not go below 0.1 meters. Camera was getting confused since the avatar's
effective height was negative.
Note the avatar is mostly underground/contorted even at 0.1 meters, but
most users setting values this low will be making ultra-tinies and would
be hiding the avatar mesh. Camera stays above ground when height is at 0.1.
2013-04-03 18:59:50 -04:00
7ea7b236d8
BUILDFIX commit policy fixes
2013-04-02 18:32:57 -04:00
0cda978db9
#include fix
2013-03-11 18:15:40 -04:00
46ab23c94b
llinventory merge fixes
2013-03-11 18:02:16 -04:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
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
fa29880ecd
merge
2013-02-28 23:34:59 +00:00
fa3f91e454
SH-3798 FIX avatar skins look dull
...
Wearable parsing error caused last texture in some assets to fail to parse.
Parser now does not throw an error if the wearable does not end in a newline
2013-02-28 23:32:00 +00:00
d1c1445193
SH-3909 Support avatar height offset
...
Adding a new visual param that allows users to manually adjust an offset for
how far off the ground (+ or -) their avatar's root bone is.
Supports the +-2m range people are used to adjusting in their viewers, but
new implementation should support server-generated appearances.
2013-02-28 17:25:37 -05:00
705a23ac0d
SH-3803 FIX Missing Wearable reported in sunshine viewer
...
Newly refactored wearable parsing did not account for extra whitespace cleanly.
Updated the code to handle extra blank lines in the wearable assets.
2013-02-14 13:41:36 -05:00
1cf611b059
SH-3651 FIX Beard edits not applying on server bakes
...
Despite incrementing the COF version, beard edits were not updating the head hash.
We were not applying layers/parameters to the baked texture hashes for
layers that did not contain a user-defined image. However, many layers have standard
morph masks, etc that are affected by wearable parameters.
Edited the LLTexLayerInterface::getWearable() method to return the proper wearable type
if there is no associated local texture index, and all parameters in the wearable
refer to a particular wearable type. Should be safe even if some (but not all) params
have no wearable type defined.
2013-02-06 18:38:17 -05:00
438ceeb008
BUILDFIX: merge cleanup
...
A couple of merge issues that caused the resulting code to not build.
2013-01-25 17:58:11 -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
33922af1fa
Merge LL release
2013-11-01 19:52:14 -07:00
81d254ddc8
FIRE-11915: Fix variable redefinition; Found by Filomena Firelyte
2013-10-22 19:44:42 +02:00
5e2324b5d3
Backed out changeset: f632d5a3a4e3 - has unwanted side effects
2013-10-17 23:46:34 -07:00
ecbdb4948f
MAINT-2968 Fix for crash on AMD hardware running current drivers.
2013-10-10 18:00:11 -05:00
c32f9976a9
FIRE-11867: Avoid unnecessary type casting, both implicit or explicit - spotted by Filomena Firelyte
2013-10-13 12:31:50 -06:00
9b17340332
A real fix for visual_param_index_map_t from Sovereign Engineer
2013-10-12 14:36:55 -06:00
0112d4538f
Pacify clang by giving llviewerwearable public access to visual_param_index_map_t
2013-10-12 10:53:38 -06:00
91e26c225b
More memory leak prevention.
2013-10-09 11:42:22 +02:00
3de08c3f6f
Replace std::map<std::string, LLJoint*> with boost::unordered_map<std::string, LLJoint*> as this one is queried very often.
2013-08-14 13:09:24 +02:00
992118ffc9
Backout fcb3339cfe08 (mesh deformer) for testing; might cause memory leak
2013-08-10 01:15:44 +02:00
0723683e83
Added Karl Stiefvater's mesh deformer, patch contributed by Inworldz LLC, updated for post-SSA Firestorm
...
*Only OpenSim enabled at this point
2013-07-11 13:31:12 -06:00
Tank_Master