Vadim ProductEngine
b5be90d0d2
STORM-1345 FIXED Replaced sliders with color pickers in the Edit Sky Preset floater.
...
TODO: Find out why the color picker widget has higher precision than the old sliders, and decide whether to "fix" that.
2011-06-28 16:59:09 +03: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
Nat Goodspeed
57c230b73e
CHOP-753: suppress VS fatal warning 4355
2011-06-28 08:58:10 -04:00
Nat Goodspeed
abb8a7018d
CHOP-753: Log LLMemoryInfo whenever framerate hits a new low.
...
Introduce FrameWatcher, a static object that hooks into the LLEventPump named
"mainloop" to get a call every frame. Track framerate over a defined sample
time (20 seconds atm); track minimum and log LLMemoryInfo every time we hit a
new minimum.
2011-06-28 08:21:49 -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
Richard Linden
200073c97a
fixed basic root folder entry to match 8 character limit
2011-06-27 19:13:42 -07:00
Richard Linden
4bb8b25bbf
merge
2011-06-27 18:44:33 -07:00
Richard Linden
e733d5c0a9
preemptively adding folder type for basic inventory so we can update sim code to match
2011-06-27 18:29:51 -07: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
Aaron Stone
c91d696233
STORM-1446 Portability fix when setting non-blocking socket options.
2011-06-27 12:49:45 -07:00
Aaron Stone
06e18dd44d
STORM-1447 Use <filters>setenv</> stanza rather than grep -v setenv.
2011-06-27 12:43:46 -07:00
Dave Parks
4df70b5523
SH-1899 Check mesh asset version before attempting to parse.
2011-06-27 12:22:28 -05:00
simon@lindenlab.com
d40bd76ec7
Merge viewer 2.7.6 from trunk
2011-06-27 10:15:24 -07:00
simon@lindenlab.com
398019ffb2
ER-910: Parcel privacy. Got new icons, cleaned up xml linkage a bit.
2011-06-27 10:11:57 -07:00
Nyx (Neal Orman)
30f3148fbd
storm-1444: Disable mesh loading
2011-06-27 11:51:06 -04:00
Dave Parks
1c4df782ec
merge
2011-06-27 10:40:02 -05:00
Dave Parks
d5c784be4e
SH-680 Apply a 128-byte discount per LoD block to cover the cost of metadata.
2011-06-27 10:39:41 -05:00
Dave Parks
5e20cee4b4
SH-1897 Don't use GLSL 1.20 unless the GL version is >= 2.1f
2011-06-27 10:34:21 -05:00
Debi King (Dessie)
7dac0bd49a
reconciled .hgtags
2011-06-27 09:35:22 -04:00
Debi King (Dessie)
9928016ad9
Added tag DRTVWR-67_2.7.4-beta1, 2.7.4-beta1 for changeset be963a4eef63
2011-06-27 09:22:57 -04:00
Oz Linden
5c9fc7d24f
increment viewer version to 2.7.6
2011-06-27 09:04:20 -04:00
Oz Linden
311a431169
Added tag 2.7.5-start for changeset 19a498fa6257
2011-06-27 09:03:33 -04:00
Jonathan Yap
f23d6c22b4
STORM-457 There is no space char after [AGENT_NAME] in 'conference-title-incoming' for Japanese language
2011-06-27 08:41:11 -04:00
Alexandrea Fride
f70480e3b2
STORM-1406 [ENG LAYOUT] Viewer - Overlapping text in Input/Output devices preference
...
with help from Jonathan Yap
2011-06-26 19:03:32 -04:00
Twisted_Laws
bd6e1b7fd8
STORM-1103 sets a minimum size for map in nearby people and makes the map resizable
2011-06-26 11:22:42 -04:00
Alexandrea Fride
ec4a0a8cd8
STORM-1327 MULTIPLE LANGS (Spanish/German) [FORMATTING] Overlapped text in About Land Window when the land is for sell: "Los objetos se incluyen en la venta"
...
With help from Jonathan Yap
2011-06-26 09:08:44 -04:00
Oz Linden
5d36b70aa6
merge changes for latest viewer-development
2011-06-26 07:32:22 -04:00
Oz Linden
ca89422fb3
merge changes for storm-1443
2011-06-26 07:25:49 -04:00
Jonathan Yap
0ec675b7d1
STORM-1292 [UNTRANSLATABLE XUI ATTRIBUTE] "Mi apariencia" tab in side menu bar > "MIS VESTUARIOS". You don't have any outfits yet. Try Search. (ALL LANGS)
2011-06-25 18:39:12 -04:00
Jonathan Yap
9a40b84bed
STORM-1302 (all langs) [TRANSLATED BUT IN ENG] (Spanish) Side Menu > Gente tab > MIS AMIGOS tab > buttons "Call", "Share" and "Teleport" and their tooltips
2011-06-25 16:37:10 -04:00
Jonathan Yap
d66545d17f
STORM-1326 [ALL LANGS] (Spanish) [HARDCODED] Selling land, advice with "Anyone" in English.
2011-06-25 11:08:36 -04:00
Xiaohong Bao
d46d74dbea
fix for SH-1904: Medallion .dae makes viewer crash during upload
2011-06-24 17:42:34 -06:00
Xiaohong Bao
3161143977
Automated merge with http://hg.secondlife.com/mesh-development
2011-06-24 15:28:34 -06:00
Xiaohong Bao
f83b08b69c
fix for SH-1878: Viewer hang in GLOD_Group::adaptTriangleBudget during LLModelPreview::genLODs;
...
SH-1891: viewer crashes while previewing "RYOMA 3D XML File.dae";
SH-1890: Crash loading palm tree
2011-06-24 15:09:10 -06:00
Dave Parks
ad4b559f9f
SH-1903 Fix for silly shader compiler error.
2011-06-24 15:30:48 -05:00
prep linden
e7c5913c05
Bug fixes for SH-1791
2011-06-24 15:21:50 -04:00
Roxie Linden
873ba5178f
automated merge
2011-06-24 11:53:54 -07:00
eli_linden
44308a50c2
sync with viewer-development
2011-06-24 11:09:26 -07:00