Dave Parks
|
a5a23c3695
|
merge
|
2011-07-01 12:25:38 -05:00 |
|
Dave Parks
|
03d22f5366
|
SH-1913 Fix for PE cost not updating appropriately when editing child prims of a linked set.
|
2011-07-01 12:24:52 -05:00 |
|
Brad Payne (Vir Linden)
|
021ce5ccaf
|
enabled mesh
|
2011-07-01 09:42:06 -04:00 |
|
Brad Payne (Vir Linden)
|
4bce553a96
|
merge viewer-development -> mesh-development
|
2011-07-01 09:41:10 -04:00 |
|
Oz Linden
|
662a927843
|
merge changes for shining branch
|
2011-06-30 19:37:56 -04:00 |
|
Oz Linden
|
6be68618c4
|
merge changes for sec-906
|
2011-06-30 19:20:25 -04:00 |
|
Dave Parks
|
a1fb8ae0d0
|
merge
|
2011-06-30 18:19:37 -05:00 |
|
Dave Parks
|
38778fcc61
|
SH-680 Update streaming cost to be based on a triangle budget instead of a magic scaler.
Reviewed by Nyx.
|
2011-06-30 18:19:09 -05:00 |
|
Dave Parks
|
7a85df9429
|
merge
|
2011-06-30 14:00:49 -05:00 |
|
Oz Linden
|
f07173a968
|
merge changes for storm-1452
|
2011-06-30 06:40:46 -04:00 |
|
Oz Linden
|
b278b61f4e
|
merge changes for storm-1406
|
2011-06-30 06:39:48 -04:00 |
|
Oz Linden
|
c8c9384949
|
merge changes for storm-1327
|
2011-06-30 06:38:39 -04:00 |
|
Oz Linden
|
ce93fc7fd5
|
merge changes for storm-1396
|
2011-06-30 06:37:25 -04:00 |
|
Oz Linden
|
a80c79097d
|
merge changes for storm-457
|
2011-06-30 06:36:25 -04:00 |
|
Oz Linden
|
d3a7792703
|
merge changes for storm-1463
|
2011-06-29 21:22:59 -04:00 |
|
Oz Linden
|
941e055309
|
merge changes for storm-1423
|
2011-06-29 21:22:20 -04:00 |
|
Oz Linden
|
f6ddd71214
|
merge changes for storm-1392
|
2011-06-29 21:21:36 -04:00 |
|
Oz Linden
|
b5001ff819
|
merge changes for storm-1368
|
2011-06-29 21:20:30 -04:00 |
|
Dave SIMmONs
|
cc73cf15e6
|
Merge latest from lindenlab/viewer-development
|
2011-06-29 11:36:19 -07:00 |
|
Oz Linden
|
a300902494
|
merge changes for storm-1302
|
2011-06-29 09:54:27 -04:00 |
|
Oz Linden
|
4425f9b821
|
merge changes for storm-1326
|
2011-06-29 09:53:34 -04:00 |
|
Oz Linden
|
060d2f3c5e
|
merge changes for storm-1292
|
2011-06-29 09:52:43 -04:00 |
|
Oz Linden
|
1049468d93
|
storm-1454
|
2011-06-29 09:52:01 -04:00 |
|
Oz Linden
|
6b7cba66e3
|
merge changes for storm-1439
|
2011-06-29 09:50:48 -04:00 |
|
Oz Linden
|
04fbb862dd
|
merge changes for storm-1352
|
2011-06-29 09:49:49 -04:00 |
|
Aura Linden
|
a57a393bb9
|
Crashfix for SEC-906
|
2011-06-28 17:39:34 -07:00 |
|
Nyx (Neal Orman)
|
a5d7485cdc
|
Automated merge with https://hg.secondlife.com/mesh-development
|
2011-06-28 15:36:34 -04:00 |
|
Nyx (Neal Orman)
|
41f3080d93
|
SH-1917 SH-1935 FIX PE cost is not always shown, includes unnecessary digits
Reformatted line showing prim equiv values, formatted to an integer,
removed old Render Cost display, and updated label of new display.
|
2011-06-28 15:36:26 -04:00 |
|
Squire
|
7db0cdefe0
|
STORM-1447, STORM-1446
merged from
https://bitbucket.org/stone_linden/viewer-development-storm-1368
|
2011-06-28 11:55:27 -07:00 |
|
Squire
|
03969822f5
|
Merged in viewer-development changes
|
2011-06-28 11:48:25 -07:00 |
|
Squire
|
df91a44d29
|
STORM-1423 (aka VOICE-3) merged from
roxie_linden/viewer-developement
|
2011-06-28 11:43:39 -07:00 |
|
Squire
|
a67627777d
|
STORM-1372, STORM-1439
Merged in:
alain_linden/viewer-development
lindenlab/viewer-development
|
2011-06-28 11:25:42 -07:00 |
|
Dave Parks
|
12e08417bf
|
SH-1169 Fix for convex decompositions not working post mesh-asset-deprecation work. (also default SLM usage to on)
|
2011-06-28 12:41:12 -05:00 |
|
prep linden
|
57581b682f
|
Fix for SH-1919 - help button added
|
2011-06-28 11:10:40 -04:00 |
|
Oz Linden
|
3bc99274f1
|
STORM-1334: compute area using integer math to avoid type conflict
|
2011-06-28 10:22:36 -04:00 |
|
Oz Linden
|
8e6ea481cf
|
merge changes for storm-1103
|
2011-06-28 09:22:50 -04:00 |
|
Oz Linden
|
94bb9c5955
|
merge changes for storm-323
|
2011-06-28 09:22:15 -04:00 |
|
Oz Linden
|
2ee2f1d6ff
|
merge changes for vwr-25480
|
2011-06-28 09:21:38 -04:00 |
|
Oz Linden
|
b24f9295a2
|
merge changes for storm-1393
|
2011-06-28 09:20:53 -04:00 |
|
Oz Linden
|
23d3b834bb
|
merge changes for storm-1334
|
2011-06-28 09:20:13 -04:00 |
|
Oz Linden
|
2a789e9c50
|
merge changes for late beta fixes
|
2011-06-28 09:18:27 -04:00 |
|
Oz Linden
|
0f140565a5
|
merge changes for beta tags
|
2011-06-28 09:17:57 -04:00 |
|
Tankmaster Finesmith
|
77bffdcec7
|
STORM-1452 Debug settings -- TRUE/FALSE name (not label) translated in foreign languages
with help from Jonathan Yap
|
2011-06-28 06:39:52 -04:00 |
|
eli_linden
|
45e1713284
|
FIX VWR-25681
|
2011-06-27 18:07:51 -07:00 |
|
eli_linden
|
02602aaad3
|
FIX VWR-25943 en_xui_change
|
2011-06-27 18:04:04 -07:00 |
|
eli_linden
|
1e54158bd5
|
FIX VWR-25881
|
2011-06-27 17:55:48 -07:00 |
|
eli_linden
|
d22f199d4e
|
FIX VWR-25880
|
2011-06-27 17:52:41 -07:00 |
|
eli_linden
|
5e65933d29
|
FIX VWR-25879
|
2011-06-27 17:49:22 -07:00 |
|
eli_linden
|
1b9c42fb0b
|
FIX VWR-25660
|
2011-06-27 16:06:37 -07:00 |
|
Brad Payne (Vir Linden)
|
3b05866653
|
merge
|
2011-06-27 18:26:12 -04:00 |