6095a2072d
more deprecated call fixes (llmsg -> LL_MSG() / llendl -> LL_ENDL)
2014-06-10 08:01:16 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
7ce5dc613d
MAINT-3661 Fix for crash when uploading corrupt .dae file.
2014-01-27 16:09:07 -06:00
b2115f4c7b
Crash protection.
2014-02-23 23:27:41 +01:00
80dfbbaacd
merge from viewer-release
2013-10-08 11:59:24 -07:00
59628d6f85
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-10-01 14:28:39 -07:00
29216ac5e7
MAINT-3179 fix bad indexing of position info generating false alarms on range checks, issue with free of data now allocated contig with positions instead, and added copious amounts of llwarns to error return sites so 'invalid element' will be a reason to read the log and not a tease.
2013-09-23 13:43:01 -07:00
0e3ad3e94b
MAINT-3153 fix potential mis-indexing in DAE loading checks
2013-09-16 12:11:58 -07:00
d38bcb6621
MAINT-2388 replace stomped fix to not crash when handed bogus model data
2013-09-16 09:40:58 -07:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
3f186aab77
Merge in viewer-release
2013-08-19 12:10:40 -07:00
d83c51a4e1
BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros
2013-08-14 21:58:30 -07: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
f87a49fad9
BUILDFIX: bad quotes
2013-07-31 11:49:34 -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
e40065f82c
BUILDFIX: #include and dependency cleanup
2013-07-19 15:03:05 -07:00
380785e613
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-06-27 16:16:56 -05:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
f782e01920
NORSPEC-267 fix UI feedback for materials edits not appearing for observers when obj was selected by them
2013-06-15 05:18:50 -07:00
eba7eb2d06
NORSPEC-233 fix default value and material apply logic errors
2013-06-08 06:28:48 -07:00
c78cd1aae6
NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and make scale accessors get with the program
2013-06-07 14:37:39 -07:00
7e4e59470f
NORSPEC-233 WIP for individual material param edits across hetero object selections
2013-06-07 08:58:15 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ad09e2111c
NORSPEC-102 & Co Reloaded
2013-05-14 21:14:46 +02:00
d9e8ee7cfd
NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consistent and increased max range on repeats per meter
2013-05-13 13:02:53 -07:00
5ac9d9cb05
LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::null
2013-05-12 16:10:31 +02:00
6fd7f146d4
Merged with viewer-dev-materials
2013-05-12 12:39:52 +02:00
f356d7eb9f
Fix many issues with selection misapplication and rendering not matching applied materials
2013-05-11 19:58:56 -07:00
e413f4b335
Fixup merge diffs
2013-05-10 15:13:07 -07:00
269b8b7de5
NORSPEC-102 Rapid materials updates are not smooth to viewer which is editing the object
2013-05-10 10:50:50 +02:00
5aa3f3c808
NORSPEC-164 fix TE copy ctor and operator= to include material pointer in addition to ID
2013-05-09 15:41:07 -07:00
5687b0c4df
Merge
2013-05-09 15:30:49 -07:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
592586052c
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-05-07 17:21:32 -05:00
dbfcd6c9c5
Optimization -- don't draw glow in alpha pool unless needed
2013-05-07 17:20:33 -05:00
1f5f0a4b06
Merge vwr-dev-mat
2013-05-07 12:42:32 -07:00
f26f0330aa
SH-4080 WIP interesting: random crash on Mac
...
cleaning up more unused files
2013-05-06 14:54:03 -07:00
18e3985120
NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.
2013-05-06 15:44:44 -05:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
fd447189c5
Merge 3.5.1 into Materials
2013-04-25 21:00:16 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
4afb70eba7
Merge with latest viewer-dev-materials.
2013-04-17 17:47:18 -04:00
67af268b78
NORSPEC-90 Alpha pool hookups for materials.
2013-04-17 01:51:39 -05:00
0b4d76ce78
NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct default env intensity
2013-04-16 08:27:30 -07:00
fafa21315f
Fix issue with alphaNonIndexedNoColorF shader and static init fail on default spec color (real source of NORSPEC-94, I think)
2013-04-12 15:21:35 -07:00
066f2acadf
Forgot to commit @#! merge
2013-04-11 16:23:36 -07:00
Tank_Master