Tank_Master
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
Nicky
b2115f4c7b
Crash protection.
2014-02-23 23:27:41 +01:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden
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
Graham Madarasz
f356d7eb9f
Fix many issues with selection misapplication and rendering not matching applied materials
2013-05-11 19:58:56 -07:00
Graham Madarasz
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
Graham Madarasz
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
Graham Madarasz
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
Graham Madarasz
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
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
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
Nyx Linden
998c31ef9e
BUILDFIX fixing undefined reference in build
2013-02-26 15:29:23 -05:00
Oz Linden
5711bda96a
clean up some debug logging, add comment on llassert
2013-02-20 12:03:29 -05:00
Kitty Barnett
a6e8e60f50
Don't overrun the message buffer extracting materials ids when the region isn't sending them
2013-02-19 21:21:41 +01:00
Brad Payne (Vir Linden)
354ccc1640
additional safety check for bad appearance messages
2013-02-15 13:44:21 -05:00
Brad Payne (Vir Linden)
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
Oz Linden
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
Geenz
5f03e197f4
Trying to set materials up for rendering! Yay!
2013-01-25 17:54:38 -05: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
Tank_Master
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
Tank_Master
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
William Todd Stinson
38a565f71a
Initial pass at getting a list of viewer objects with non-null material IDs.
2012-10-09 12:30:38 -07:00
William Todd Stinson
dbe0a577ae
Removing overly verbose debug outputs.
2012-10-03 18:31:33 -07:00
William Todd Stinson
ae10e78d97
Added some initial basic decoding of the material value per face.
2012-09-14 17:56:42 -07:00
simon@Simon-PC.lindenlab.com
38acb45af8
Merge in latest viewer-development
2012-09-05 17:17:54 -07:00
Brad Payne (Vir Linden)
6ae4802e6d
merge
2012-07-30 19:10:46 -04:00
Xiaohong Bao
833d73d674
fix for SH-3235: Bump maps are not loaded until objects change LOD
2012-07-13 17:46:43 -06:00
Brad Payne (Vir Linden)
409be9dcc4
SH-3267 WIP - extract cof version from avatar appearance message, use to reject stale updates
2012-07-13 16:59:57 -04:00
Tank_Master
63adc57b38
Update 3 of SSB + RLVa
2013-03-05 18:57:27 -08:00
Kitty Barnett
d74b2985a5
Merged with Appearance-MixedViewers tip
...
--HG--
branch : .RLVa
2013-03-03 13:13:22 +01:00
Tank_Master
6425b3cd65
Merge RLVa SSB update
2013-02-24 18:24:48 -08:00
Tank_Master
6207030884
Merge FS LGPL tip
2013-02-23 17:09:53 -08:00
Kitty Barnett
e1526c4048
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-20 14:26:21 +01:00
Kitty Barnett
b368a21202
Merged with Appearance-Misc tip
...
--HG--
branch : .RLVa
2013-02-04 21:06:34 +01:00
Tank_Master
ea86bb88c3
first pass merge
2013-02-04 10:52:32 -08:00
Tank_Master
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
Tank_Master
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
Brad Payne (Vir Linden)
27c7b259b4
SH-3267 WIP
2012-07-12 18:24:23 -04:00
Dave Parks
4a5ad35793
MAINT-570 Remove unused memory tracking system LLMemType
2012-07-20 11:42:15 -05:00
Brad Payne (Vir Linden)
e4a0dda457
SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards
2012-06-28 14:24:04 -04:00
Brad Payne (Vir Linden)
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
Loren Shih
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
Boroondas Gupte
2c584790d0
VWR-24487 make PREHASH variables char const* const
2011-04-01 09:14:52 -04:00
Arrehn
87dd359b1c
Opensim - detect and use various configuration limits which might be different from SL, by ArminW
2011-08-28 07:10:09 -04:00
Oz Linden
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Tofu Linden
5a34cf1af8
Merge from viewer2 trunk.
2010-01-28 12:48:48 -08:00
Tofu Linden
0d5a6ea3c0
CID-331
...
Checker: UNINIT_CTOR
Function: LLPrimitive::LLPrimitive()
File: /indra/llprimitive/llprimitive.cpp
2010-01-28 10:25:09 -08:00
Dave Parks
4e420a36c6
Fix for missing LOD spam.
2009-11-07 08:22:39 -06:00