Oz Linden
|
90536f6cdf
|
protect against missing mNormalMap or mSpecularMap
|
2013-03-01 17:34:03 -05:00 |
|
Oz Linden
|
3c65f7fef0
|
merge fix for unit test problem with some python configurations
|
2013-03-01 15:47:50 -05:00 |
|
Oz Linden
|
e44c097aee
|
merge changes for ui fixes
|
2013-03-01 12:56:50 -05:00 |
|
Oz Linden
|
89816222d2
|
change channel name to new convention
|
2013-03-01 12:56:20 -05:00 |
|
Oz Linden
|
fd96fe41a6
|
remove use of system llbase module in integration tests; always use the one from this tree
|
2013-03-01 11:41:33 -05:00 |
|
Tonya Souther
|
2eaf35b946
|
Clear face's material ID internally when removing the material.
|
2013-02-28 07:44:45 -06:00 |
|
Tonya Souther
|
fa7dd43308
|
Wire up LLMaterialMgr::remove() to edit panel.
|
2013-02-27 19:27:46 -06:00 |
|
Oz Linden
|
8397f62059
|
force new codeticket number
|
2013-02-27 13:19:50 -05:00 |
|
Kitty Barnett
|
e71de8619e
|
Fixed GCC compiler error in previous changeset
|
2013-02-25 20:06:46 +01:00 |
|
Kitty Barnett
|
c970cb0283
|
Added "Selected Material Info" menu option to query basic material information about the current selection
|
2013-02-25 16:19:35 +01:00 |
|
Kitty Barnett
|
fbf8e51c60
|
Added LLMaterialMgr::remove() to remove material information from a face
|
2013-02-25 00:16:14 +01:00 |
|
Kitty Barnett
|
4d1446766a
|
Merge stray fix for infinite "get all" request loop on non-material regions
|
2013-02-24 23:42:53 +01:00 |
|
Oz Linden
|
5711bda96a
|
clean up some debug logging, add comment on llassert
|
2013-02-20 12:03:29 -05:00 |
|
Oz Linden
|
372f3d66ff
|
merge changes for material data overrun
|
2013-02-20 10:15:20 -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 |
|
Kitty Barnett
|
b4a87776d4
|
Prevent a failed GET from causing an infinite material request loop when there are still pending POST requests for the same region
|
2013-02-18 19:37:19 +01:00 |
|
Oz Linden
|
1b4a585af6
|
merge latest rendering fixes
|
2013-02-15 18:35:34 -05:00 |
|
Oz Linden
|
64a4a13397
|
fix crasher in setNumTEs
|
2013-02-15 15:40:43 -05:00 |
|
Geenz
|
ec3b4e05a4
|
Merge with latest viewer-dev-materials.
|
2013-02-15 11:52:18 -05:00 |
|
Geenz
|
c2785a740e
|
Fixed: alpha mode shaders not being bound appropriately.
|
2013-02-15 11:49:59 -05:00 |
|
Oz Linden
|
b7cd89da5f
|
change to force new codeticket number
|
2013-02-12 16:43:16 -05:00 |
|
Oz Linden
|
2bcfc9554d
|
remove obsolete LLMemType tracing from materials
|
2013-02-12 14:38:47 -05:00 |
|
Oz Linden
|
8bb3d0891d
|
merge up to 3.4.5-release
|
2013-02-12 13:27:03 -05:00 |
|
Oz Linden
|
66c75202a8
|
merge renderer update fix
|
2013-02-12 13:10:11 -05:00 |
|
Oz Linden
|
e87000ba07
|
Added tag 3.4.5-release for changeset a49c715243a3
|
2013-02-12 07:06:24 -05:00 |
|
Tonya Souther
|
3422f75cf7
|
Tell the renderer to use the updated material immediately on editing it.
|
2013-02-06 21:38:05 -06:00 |
|
Oz Linden
|
a5cfd935d3
|
merge fix to defer server updates
|
2013-02-06 15:57:24 -05:00 |
|
Oz Linden
|
79eeae502c
|
Added tag 3.4.5-beta5 for changeset 852b69ef0b5f
|
2013-02-05 13:25:24 -05:00 |
|
Oz Linden
|
34c0ed7e99
|
merge changes for DRTVWR-297
|
2013-02-05 12:32:52 -05:00 |
|
Oz Linden
|
d96c3220f8
|
tag merge of DRTVWR-297
|
2013-02-05 12:32:14 -05:00 |
|
Oz Linden
|
3279201c1b
|
merge changes for DRTVWR-296
|
2013-02-05 12:30:34 -05:00 |
|
Oz Linden
|
702332fc02
|
tag merge of DRTVWR-296
|
2013-02-05 12:30:30 -05:00 |
|
Tonya Souther
|
f2b026138d
|
Don't send a materials update to the sim until the previous one has been acknowledged.
|
2013-02-05 03:30:56 -06:00 |
|
Dave Parks
|
5a69837345
|
MAINT-2323 Fix for crash on shutodwn in mesh responder destructors
|
2013-02-04 12:23:33 -06:00 |
|
Geenz
|
170ecf5e8a
|
Whoops! Normal maps don't belong here...
|
2013-02-04 13:08:37 -05:00 |
|
Geenz
|
a91b231bfe
|
Merged with latest viewer-dev-materials.
|
2013-02-04 12:49:26 -05:00 |
|
Geenz
|
aae698ff0c
|
Merged with latest viewer-dev-materials.
|
2013-02-04 11:55:04 -05:00 |
|
Geenz
|
2ae4b6976b
|
Added a new draw pool specifically for faces with materials applied to them. Removed materials rendering from the bump draw pool, and reverted it to its previous state.
|
2013-02-04 11:32:05 -05:00 |
|
Oz Linden
|
68ec77127b
|
merge tonyas loop fixes
|
2013-02-04 09:38:06 -05:00 |
|
Oz Linden
|
7cc7ae873c
|
improve and clarify logging
|
2013-02-04 09:35:12 -05:00 |
|
Tonya Souther
|
5bbc33383e
|
Don't spam the sim with repeated queries for an empty list of materials.
|
2013-02-03 23:01:22 -06:00 |
|
Tonya Souther
|
da82358116
|
Enable sending material updates.
|
2013-02-03 23:00:37 -06:00 |
|
Kitty Barnett
|
d149aea87c
|
Merged with viewer-dev-materials
|
2013-02-04 01:01:07 +01:00 |
|
Kitty Barnett
|
0a99aadd7a
|
Material PUT queue entries aren't removed after a request is sent
|
2013-02-04 00:57:45 +01:00 |
|
Oz Linden
|
4c71d5eba7
|
merge up to latest version from tonya
|
2013-02-01 10:21:46 -05:00 |
|
Oz Linden
|
90bf22ef24
|
add debug logging, ostream support for material ids, and some minor cleanup
|
2013-02-01 10:20:44 -05:00 |
|
Whirly
|
0908b60c1c
|
STORM-1930 Quality & Speed slider has Ultra label where High should be.
|
2013-02-01 08:10:16 +00:00 |
|
Oz Linden
|
510a681341
|
make logging tag for Materials uniform
|
2013-01-31 16:00:57 -05:00 |
|
Tonya Souther
|
132db13fb6
|
Fixing VC++ compile error: calling a static routine doesn't need the "this" pointer
|
2013-01-31 14:49:11 -06:00 |
|
Tonya Souther
|
c1b110dd1d
|
Merging in main repository.
|
2013-01-31 11:40:16 -06:00 |