c19200eb00
BUG-2707 add some logging to help narrow down what part of login instance handling is going awry
2013-05-30 17:01:28 -07:00
38f62f5cee
Fix for some objects not rendering underwater with advanced lighting enabled
2013-05-30 17:44:05 -05:00
4f6102dfaa
Minor tweak to turn down FMOD Ex noisy console logging while we look into root problem
2013-05-30 14:21:37 -07:00
6b2266e9fb
BUG-2707 first learn fly, then learn kick; moved setup of listener to after Area init is complete and made the coro that rewrites URIs do less work on the stack
2013-05-30 09:46:12 -07:00
4a1b6bdeef
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-30 11:06:16 -05:00
7931cac194
MATBUG-126 BUG-2707 speculative fix for login crasher based on stack from Kat
2013-05-30 06:39:43 -07:00
8d4594cd11
NORSPEC-96 diff/norm/spec tex scale ratio rodeo, yo
2013-05-29 19:10:53 -07:00
ee4c2e837b
Fix for rigged attachments not having specular highlights with legacy shininess.
2013-05-29 20:46:29 -05:00
81b9a070b6
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-29 18:48:55 -05:00
743d1a777e
NORSPEC-198, NORSPEC-176, NORSPEC-106, NORSPEC-202 et al -- Material matrix testing based overhaul WIP
...
Reviewed by Graham
2013-05-29 18:48:09 -05:00
f3def8fce6
merge changes for 3.5.3-release
2013-05-29 14:29:21 -04:00
dcfb18373e
increment version to 3.5.4
2013-05-29 10:45:09 -04:00
f6282b1705
Added tag 3.5.3-release for changeset a277b841729f
2013-05-29 10:44:30 -04:00
287b631d9a
NORSPEC-211 less intrusive version of this fix
2013-05-28 15:57:01 -07:00
50158987fa
NORSPEC-211 better handling of diff alpha mode
2013-05-28 12:28:47 -07:00
4d66b25abf
NORSPEC-182 do not add 'Use Texture' menu items in XML to avoid accidental appearance in menu 1st time
2013-05-28 11:59:20 -07:00
fafc23e3b4
Merge viewer-dev-mat
2013-05-25 07:43:16 -07:00
43bb034955
NORSPEC-189 throw caution to the wind and avoid using getVolume() check which has deleterious effects on materials rendering
2013-05-24 15:15:55 -07:00
66e5375967
NORSPEC-96 NORSPEC-189 another attempt at planar stretch across all 3 channels and make the materials CB use a UUID instead of this pointer for safety
2013-05-24 15:07:23 -07:00
ad89d26dc6
norspec-107: remove the need for a friend declaration in local textures
2013-05-24 12:55:52 -04:00
c3804fd041
MATBUG-8: fix local texture support for normal and specular maps
2013-05-24 11:47:06 -04:00
f66b71262e
merge changes for maint-2724
2013-05-24 09:49:18 -04:00
0004f418f4
NORSPEC-210 fix issues with the map used to store TE-specific registrations which was only invoking the CB for the last TE on log-in by replacing std::map with boost::unordered_map
2013-05-24 04:46:18 -07:00
260afbcece
NORSPEC-192 fix more incorrect batching, fix bug in reflecting normal map state in build tool, and protect against callback crashes when switching regions
2013-05-23 16:24:34 -07:00
3be79d5371
MAINT-2724: Make viewer explicitly set coroutine stack size.
...
Introduce LLCoros::setStackSize(), with a compile-time default value we hope
we never have to use. Make LLAppViewer call it with the value of the new
settings variable CoroutineStackSize as soon as we've read settings files.
(While we're at it, notify interested parties that we've read settings files.)
Give CoroutineStackSize a default value four times the previous default stack
size. Make LLCoros::launch() pass the saved stack size to each new coroutine
instance.
Re-enable lleventcoro integration test. Use LLSDMap() construct rather than
LLSD::insert(), which used to return the modified object but is now void.
2013-05-23 16:28:20 -04:00
33f674a0d0
NORSPEC-208 re-enable TE-specific material mgr registration to avoid cross-talk when editing faces
2013-05-23 11:40:45 -07:00
9030ecec06
NORSPEC-193 NORSPEC-161 add new batch break criterion to CompareBatchBreakerModified and add shortcut for materials info dump
2013-05-23 10:55:41 -07:00
e6de3d6232
Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials
2013-05-23 12:49:23 -05:00
6a9564eead
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
2013-05-23 12:48:30 -05:00
933d4c40f4
NORSPEC-198, NORSPEC-176, NORSPEC-106 WIP Fix for various fullbright/shiny descrepencies.
2013-05-23 12:47:52 -05:00
9ef98bece2
NORSPEC-193 NORSPEC-161 make legacy shiny a batch breaker when materials are in play
2013-05-23 10:42:32 -07:00
74a84738ed
Merge
2013-05-22 15:24:22 -07:00
5c6da1c8ee
NORSPEC-204 make tex controls act like diffuse map when in media mode
2013-05-22 15:23:10 -07:00
eff106ae68
merge latest integration changes
2013-05-22 16:13:54 -04:00
b3000136b8
NORSPEC-186 clamp norm/spec map rotations to 0-360 until we can fix the server side issue with negative rotations
2013-05-22 12:22:04 -07:00
74ea01d6f2
merge changes for maint-2718
2013-05-22 14:40:26 -04:00
46c3c7f7a5
Merge
2013-05-22 10:27:00 -07:00
69ad1f6236
NORSPEC-205 more dueling spec controls
2013-05-22 09:54:11 -07:00
2b517892ad
merge latest project repo
2013-05-22 11:43:32 -04:00
d4f2a2df53
merge tags for 3.5.2-release
2013-05-22 11:41:37 -04:00
5758b9e304
merge changes for 3.5.3-release
2013-05-22 11:09:43 -04:00
03eb406d05
NORSPEC-203 fix handling of objs with materials due to alpha mode in non-deferred
2013-05-22 07:06:22 -07:00
7fad053982
merge changes for chui-967
2013-05-22 06:27:51 -04:00
892f3cdd2c
CHUI-967: fix display of % escapes in chat
2013-05-22 06:26:54 -04:00
1d8b9ff07c
MAINT-2718 FIX Update Windows version of FMOD Ex DLLs with non-logging versions
2013-05-21 21:38:09 -07:00
8b7a4c503c
NORSPEC-96 tweak fix to follow clone/modify/re-apply pattern from build tool to avoid changing objects sharing a material
2013-05-21 17:09:04 -07:00
d187ee8e59
NORSPEC-96 slight refrain, make Stretch Textures apply to norm/spec maps in planar texgen mode
2013-05-21 16:51:36 -07:00
e2ca8412e4
Merge
2013-05-21 16:13:09 -07:00
4f08780b00
merge changes for maint-2628
2013-05-21 19:05:23 -04:00
06b3879acc
NORSPEC-200 fix regression from 188 fix caused by not having enough bits to store SHINY_TEXTURE in the TEs bitfield
2013-05-21 15:27:52 -07:00
Graham Madarasz