941e055309
merge changes for storm-1423
2011-06-29 21:22:20 -04:00
f6ddd71214
merge changes for storm-1392
2011-06-29 21:21:36 -04:00
b5001ff819
merge changes for storm-1368
2011-06-29 21:20:30 -04:00
21ff3d0d1c
CHOP-753: fix minor compilation errors on Linux
2011-06-29 20:42:30 -04:00
7f8ec9f142
CHOP-753: Introduce LLSD access to LLMemoryInfo ** BROKEN **
...
This is known not to compile on Mac yet; checking in to concurrently work on
Linux-specific code.
2011-06-29 20:35:44 -04:00
3be8ae9d42
STORM-1305 WIP Edit Sky floater: removed the old sun position slider, added hour marks to the new one.
2011-06-30 01:19:14 +03:00
76acc75437
STORM-1305 WIP Edit Sky floater UI changes.
...
* Implemented new layout (made the floater smaller, moved widgets around).
* Implemented new sun phase slider, bound to 24h time.
2011-06-29 23:48:36 +03:00
cc73cf15e6
Merge latest from lindenlab/viewer-development
2011-06-29 11:36:19 -07:00
290423764d
merge out latest viewer-development
2011-06-29 12:10:03 -04:00
a300902494
merge changes for storm-1302
2011-06-29 09:54:27 -04:00
4425f9b821
merge changes for storm-1326
2011-06-29 09:53:34 -04:00
060d2f3c5e
merge changes for storm-1292
2011-06-29 09:52:43 -04:00
1049468d93
storm-1454
2011-06-29 09:52:01 -04:00
6b7cba66e3
merge changes for storm-1439
2011-06-29 09:50:48 -04:00
04fbb862dd
merge changes for storm-1352
2011-06-29 09:49:49 -04:00
1262f710b5
CHOP-753: Report Linux memory stats 1/line, like other platforms.
...
Previous code deliberately flowed the different lines from MEMINFO_FILE
together on a single line, which seems pointless to me, since we want to be
able to grep the viewer log to recognize individual stats.
Also replace classic-C LLFILE* machinery used to read MEMINFO_FILE with
std::ifstream and std::getline().
2011-06-28 23:09:00 -04:00
a57a393bb9
Crashfix for SEC-906
2011-06-28 17:39:34 -07:00
26be53aede
CHOP-753: Introduce a sliding window of framerate samples.
...
The trouble with remembering the slowest-ever framerate is that framerate
drops dramatically on login, then typically bounces back to something
reasonable during the session. So the session-normal framerate has to drop
pretty dramatically before it falls below the original login framerate. To
address this, only remember the last ~10 minutes of framerates, and log memory
stats every time a new framerate is slower than the previous 10 minutes.
2011-06-28 16:01:16 -04:00
7db0cdefe0
STORM-1447, STORM-1446
...
merged from
https://bitbucket.org/stone_linden/viewer-development-storm-1368
2011-06-28 11:55:27 -07:00
03969822f5
Merged in viewer-development changes
2011-06-28 11:48:25 -07:00
df91a44d29
STORM-1423 (aka VOICE-3) merged from
...
roxie_linden/viewer-developement
2011-06-28 11:43:39 -07:00
a67627777d
STORM-1372, STORM-1439
...
Merged in:
alain_linden/viewer-development
lindenlab/viewer-development
2011-06-28 11:25:42 -07:00
3bc99274f1
STORM-1334: compute area using integer math to avoid type conflict
2011-06-28 10:22:36 -04:00
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
8e6ea481cf
merge changes for storm-1103
2011-06-28 09:22:50 -04:00
94bb9c5955
merge changes for storm-323
2011-06-28 09:22:15 -04:00
2ee2f1d6ff
merge changes for vwr-25480
2011-06-28 09:21:38 -04:00
b24f9295a2
merge changes for storm-1393
2011-06-28 09:20:53 -04:00
23d3b834bb
merge changes for storm-1334
2011-06-28 09:20:13 -04:00
2a789e9c50
merge changes for late beta fixes
2011-06-28 09:18:27 -04:00
0f140565a5
merge changes for beta tags
2011-06-28 09:17:57 -04:00
57c230b73e
CHOP-753: suppress VS fatal warning 4355
2011-06-28 08:58:10 -04:00
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
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
45e1713284
FIX VWR-25681
2011-06-27 18:07:51 -07:00
02602aaad3
FIX VWR-25943 en_xui_change
2011-06-27 18:04:04 -07:00
1e54158bd5
FIX VWR-25881
2011-06-27 17:55:48 -07:00
d22f199d4e
FIX VWR-25880
2011-06-27 17:52:41 -07:00
5e65933d29
FIX VWR-25879
2011-06-27 17:49:22 -07:00
1b9c42fb0b
FIX VWR-25660
2011-06-27 16:06:37 -07:00
c91d696233
STORM-1446 Portability fix when setting non-blocking socket options.
2011-06-27 12:49:45 -07:00
06e18dd44d
STORM-1447 Use <filters>setenv</> stanza rather than grep -v setenv.
2011-06-27 12:43:46 -07:00
30f3148fbd
storm-1444: Disable mesh loading
2011-06-27 11:51:06 -04:00
5e20cee4b4
SH-1897 Don't use GLSL 1.20 unless the GL version is >= 2.1f
2011-06-27 10:34:21 -05:00
7dac0bd49a
reconciled .hgtags
2011-06-27 09:35:22 -04:00
9928016ad9
Added tag DRTVWR-67_2.7.4-beta1, 2.7.4-beta1 for changeset be963a4eef63
2011-06-27 09:22:57 -04:00
5c9fc7d24f
increment viewer version to 2.7.6
2011-06-27 09:04:20 -04:00
311a431169
Added tag 2.7.5-start for changeset 19a498fa6257
2011-06-27 09:03:33 -04:00
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
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
Oz Linden