09913a4517
Backed out changeset a1853307ce6c: re-enable Starlight skins.
2012-03-12 10:37:41 -05:00
85d7e6ee62
commented out starlight skin selection, changed skin an theme debug settings to prevent use of non working skin.
2012-03-11 00:50:11 -08:00
7ab3d1ea47
re-add mode settings switch at login. Added Firestorm mode, set as default when no settings file exsists
...
only differences between firestorm and phoenix mode is:
phoenix uses vintage skin and firestorm mode uses firestorm skin
firestorm mode has nav bar enabled by default, phoenix mode does not
2012-03-06 00:56:28 -08:00
2cc39f35a0
MAINT-708 Use texture compression to minimize memory bloat (experimental)
2012-03-02 13:35:10 -06:00
06f07ec6fb
Merge up to 26725 / e9dd1416d96a (v/dev tip)
2012-03-02 22:17:21 +01:00
4b3d767423
Hopefully more reliable way to push group notices, toasts and chiclets around
2012-02-25 11:58:03 +01:00
6550a70518
Fixed "Invalid control VersionChannelName" warning at startup (apparently orphaned - not in V3 anymore)
2012-02-21 19:02:27 +01:00
52782548c8
SH-2973 Rearrange shutdown operations to prevent crash on exit on OSX
2012-02-14 17:09:42 -06:00
ca179444a1
SH-2973 Potential fix for crash in ~LLVOAvatarSelf
2012-02-13 19:13:22 -06:00
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
1ab8e3f0f7
Replaced gSavedSettings.get* with LLCachedControl in places where it's frequently called.
2012-02-05 18:57:59 +01:00
ba83861327
Merge with 26411 / 7a29beb4dd99 (FS tip).
2012-02-04 23:18:19 +01:00
a261b305df
Save global and per-account settings early in the shutdown process to make sure that most updates are saved even if shutdown crashes later. Possible fix for FIRE-4871, FIRE-4875, FIRE-4876, and FIRE-4884.
2012-02-04 13:31:59 -06:00
47124812cd
Merge up to 26394 / 1d7dbcc52ca3 (FS tip).
2012-02-02 19:49:00 +01:00
cf38d67b47
Backed out changeset: 0c99a89542b0
2012-01-31 08:35:56 -08:00
5f99af5951
Merge up to 26351 / 0c99a89542b0 (FS tip).
2012-01-31 11:52:14 +01:00
050be7eddf
Merge up to 26341 / 767757e005e3 (V/dev tip).
2012-01-31 11:38:33 +01:00
25376b5ba7
FIRE-4462, revert 0e3b51eae194: preservation of dockstate on crash breaks docking handling.
2012-01-31 00:20:47 -05:00
52fc943c6d
Merge up to 26312 / 0010858de5a1 (V/dev tip).
2012-01-27 18:29:47 +01: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
71e61766f5
Merge up to 26006 / c02c9b228b5a (FS tip).
2012-01-19 19:43:35 +01:00
9d0e27dce0
Fixed support link in llappviewer.cpp
2012-01-19 09:45:22 +01:00
1536e416d7
Merge up to 25986 / 5d3e6c6e3b60 (FS).
2012-01-17 21:18:04 +01:00
8628ee0af1
Made cache empty warning at login localizable
2012-01-17 21:17:23 +01:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
1de95e0682
Replaced slow calls to gSavedSettings with faster LLCachedControls in LLAppViewer::idle methods
2012-01-16 13:04:33 +01:00
1e56e4c95f
Changed the wording of the fatal error message to be less intimidating.
2012-01-15 01:38:23 +01:00
ce6dba2b4d
Fixed floater positions and per-account settings on crash and subsequent login retry. Fixes FIRE-1838 FIRE 2527 FIRE-4685 FIRE-2613
2012-01-09 16:44:07 +01:00
363d41a34e
Fixing a merge issue in memory handling. Reverts fixes for FIRE-3760 & FIRE-3834 and applies missing fix for SH-2624 by Bao Linden
...
This enables private memory pools again!
2011-12-31 17:25:34 +01: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
Tonya Souther