1ed8faee81
merge changes for vmrg-219
2012-01-30 15:48:44 -05:00
717a6f3306
Introduce two new parameters "CurlUseMultipleThreads" and "CurlRequestTimeOut" for QA to test Curl.
2012-01-25 18:27:40 -07:00
e4b63c96b8
EXP-1804 FIX -- Drag and drop operations can be blocked by modal dialogs
...
* Added support for marketplace notifications that don't display the dialog
until the next frame, leaving room for the drag and drop operation to
properly complete before the notification shows up and interferes.
2012-01-17 14:59:18 -08:00
37593f276c
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
2012-01-17 12:05:23 -08:00
1422be8312
Merge from viewer-development
2012-01-09 09:56:52 -08:00
1c4474f894
Merge from viewer-experience
2012-01-04 14:06:36 -08:00
a3e30250e8
merge
2012-01-04 09:59:57 -05:00
0ccf2b5a1c
EXP-1693 FIXED the date localization in Item Profile window, Voice Morphs window and in scroll list widget in general.
...
- Added a customizable date format string to be used for scroll list cell of "date" type.
- The date localization does not change the value of a scroll list cell changing only its string representation.
- Added using localized week days and month names from strings.xml for all locales not only Ja and Pl as it was before.
- Changed the date format in Item Profile window (French locale) as noted in the issue description.
- For this fix the French locale still needs the localization of the following strings in strings.xml:
<string name="dateTimeWeekdaysNames">
<string name="dateTimeWeekdaysShortNames">
<string name="dateTimeMonthNames">
<string name="dateTimeMonthShortNames">
<string name="dateTimeDayFormat">
<string name="dateTimeAM">
<string name="dateTimePM">
2011-12-21 14:10:02 +02:00
9a55888ec4
Merge from viewer-pre-beta for IM toasts crash fix
2011-12-16 16:02:04 -08:00
16b6a47247
EXP-1742 FIX -- Clicking IM notification or receiving multiple IM notifications in quick succession crashes to desktop
...
* Moved toast logic for mouse hover out of the draw call to avoid chain of callbacks that lead to reordering of the draw list while we are iterating over it.
2011-12-16 15:07:04 -08:00
90b8fb07cc
Merge with latest from viewer-experience
2011-12-12 16:13:23 -08:00
642ea00a08
merge
2011-12-12 10:45:13 -05:00
f1a4593e47
merge changes for vmrg-204
2011-12-12 09:04:33 -05:00
35020db3a9
Refactored marketplace inventory import HTTP requests and surrounding support to remove it from the UI panel code.
2011-12-07 15:04:39 -08:00
78233d1bf9
SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while occlusion queries from previous frame are still pending and perform texture decode work.
2011-12-05 17:55:40 -06:00
c9c03ffa0c
fix for sh-2735: LLCurl causes SL to freeze when logout
2011-12-01 14:52:37 -07:00
c191f523a9
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-30 17:57:09 -08:00
85392acac0
merge
2011-11-29 14:43:09 -06:00
20221c8e77
EXP-1485 FIX -- Viewer should have a minimum size
...
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
b69be18d7b
merge changes for vmrg-193
2011-11-24 06:56:57 -05:00
4b0d2f8209
merge
2011-11-22 09:49:05 -05:00
b4766d2fde
fix for sh-2601: [crashhunters] crash in LLBufferArray::countAfter()
...
sh-2602: [crashhunters] crash on exit in ~LLPumpIO()
2011-11-21 14:42:21 -07:00
cfb666e9d9
merge
2011-11-15 17:04:37 -06:00
e4e4977f5e
EXP-1527 FIX Debug values for windowwidth and windowheight can be set below minimum required values
...
and
EXP-1528 Launching viewer with a settings.xml file with windowwidth and windowheight set below minimum values, launches to those values not minimum window size
2011-11-11 12:29:04 -08:00
b2fffa74f7
Automated merge with http://hg.secondlife.com/viewer-development
2011-11-10 10:58:11 -08:00
db7924681d
SH-24114 Remove unused vectorization code (outdated/unused with SSE2 requirement and llvetor4a et al)
2011-11-08 17:46:43 -06:00
a507fc259b
finished removing remnants of media browser
2011-11-07 15:04:53 -08:00
55f69de90c
merge
2011-11-02 11:46:18 -05:00
51c7887f8d
merge
2011-10-31 11:35:22 -04:00
5c868a90f2
SH-2635 FIX - always send crash report if previous session froze
2011-10-27 17:39:07 -04:00
0637fe27bc
fix for SH-2624: crash at LLPrivateMemoryPoolManager::freeMem: ASSERT (!addr)
2011-10-25 22:53:40 -06:00
e2b52009ea
merge
2011-10-24 15:32:58 -05:00
f5197b6158
merge with viewer-dev
2011-10-21 14:41:24 -07:00
dbb353d3b0
fix for SH-2516: Full Bright Geometry Rendering Increases Rapidly, Destroying Frame Rate.
2011-10-21 11:53:29 -06:00
250ab43e4e
SH-2571 Add shader driven render for low detail terrain.
2011-10-19 17:41:02 -05:00
f19f43c746
merge
2011-10-19 16:21:18 -05:00
4e17d830ba
EXP-1402 Nearby Voice panel does not update to new call or from nearby voice info once opened
2011-10-18 16:46:41 -07:00
53ce47fc1c
merge changes for STORM-1654
2011-10-18 17:40:04 -04:00
b1fa752282
EXP-1368 FIX -- Crash on Exit in FUI viewer
2011-10-14 12:13:49 -07:00
c0ca8e5e2e
Merge backout of b782a75c99e6
2011-10-14 11:58:35 -05:00
4331c112ab
Backed out changeset b782a75c99e6
2011-10-14 11:52:40 -05:00
bb93dc154a
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
2011-10-11 22:49:47 -07:00
d0cda13235
EXP-1275 FIX A UI element or Keyboard shortcut to clear the viewport
...
Ctrl+Shift+U now toggles UI and hides floaters
refactored main_view.xml
made all members of llviewerwindow private
2011-10-11 22:49:00 -07:00
f9e900f5ac
* New floater positioning code. Better than what's checked in but not great.
...
* Floater updates for positioning and to revert some earlier string changes.
2011-10-11 17:36:23 -07:00
852349218e
merge changes for vwr-26864
2011-10-11 10:58:02 -04:00
e61569d714
added compound LLSD parsing to param blocks
...
reviewed by Leslie
2011-10-10 14:08:14 -07:00
1f4bc18050
merge
2011-10-05 19:18:58 -05:00
e61da05739
merge with viewer-development
2011-10-05 13:01:29 -07:00
194bedbb96
merge changes for vwr-26864
2011-10-05 09:03:24 -04:00
c4aa8c50da
SH-2447, SH-2525, SH-2276 Strip out defunct global illumination code, add accounting for how much memory is taken up by LLRenderTarget, fix crash on login in bindGLIndices (work around driver bug that doesn't respect VAO state WRT to index buffers), remove some unused render targets, remove some unused shaders, make it possible to run a fullscreen session
2011-10-04 02:31:54 -05:00
Oz Linden