0b3756aeab
Updated license header template for 2012
2012-01-23 13:29:43 -08:00
e181563a27
Merge with 26130/5cf2a0a7266e (FS tip).
2012-01-23 20:50:04 +01:00
b458797d17
Add missing FSLandmarkCreatedNotification to settings.xml.
2012-01-23 20:48:59 +01:00
7ca91c3c6b
Merge with 26094/5ffaeb3ad197 (FS-FUI default tip).
2012-01-23 17:47:37 +01:00
adf6ca947e
Merge up to 26121/6a223218718e; latest RLVa from catznip-3.2.0 ( http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0 ).
2012-01-23 17:09:53 +01:00
6958381112
Merge up to 26092/6ceebf5ce17b; Branch Chat-NearbyChat from catznip-3.2.0 ( http:///bitbucket.org/Kitty_Barnett/catznip-3.2.0 ).
...
This will enable chat docking/undocking from contacts floater again.
2012-01-23 14:56:47 +01:00
19d0384cd8
Redesigned snapshot panel with advanced options at the bottom
2012-01-23 00:26:01 +01:00
888569fa47
Fixed COntacts and IM floaters. Use "Show_title=false" if no title is wanted in a panel
2012-01-22 15:10:19 +01:00
b8de6ee1a5
Removing additional validation check in llurlrequest.cpp - it's checked in isValid() already
2012-01-22 14:35:55 +01:00
4cc05f3e3b
Merge up to 26018 / 0b3f2b257f95 (FS tip).
2012-01-21 18:10:14 +01:00
e143ed273f
Brought back old minimap layout without header
2012-01-21 15:38:08 +01:00
cce2e278d0
Fixed crashes after merge when trying to access the people panel
2012-01-21 14:07:03 +01:00
b4d00f3003
Added quickprefs and AO buttons to button toolbar
2012-01-21 12:53:03 +01:00
acf34d5753
Fixed line endings - no code change
2012-01-21 11:53:49 +01:00
f66ccd1572
Implement extraction of stream metadata (title/artist) with gstreamer.
2012-01-20 23:30:02 +01:00
f391ec3678
Fix crashes when curl runs out of handles. Proposed fix for FIRE-4772 FIRE-4773
2012-01-20 22:00:56 +01:00
407c3fcd43
fix for SH-2823 and SH-2824: LLCurl crash inside LLBufferArray::countAfter() and LLBufferArray::copyIntoBuffers
2012-01-20 11:55:15 -07:00
309f9dcfd1
add more exception handlings for llcurl fix. By Bao Linden
2012-01-22 14:30:04 +01:00
16a840a42e
Synchronizing statusbar with pre-FUI version: Fixes proper alignment of parcel info panel
2012-01-20 00:28:24 +01:00
e8418667bd
Don't accidentially commit testing stuff :D Enable ground textures again.
2012-01-20 00:01:40 +01:00
1c8e2cff0f
Fix a crash if nearby_chat is not created (default on FUI)
2012-01-20 00:00:29 +01:00
47672f6cd5
Revert to FS gpu_table.txt again, it's newer and has more cards.
2012-01-19 20:41:57 +01:00
71e61766f5
Merge up to 26006 / c02c9b228b5a (FS tip).
2012-01-19 19:43:35 +01:00
9cc5628c5e
Fix crash in getInventoryItemByAsset if there are AT_NONE objects
2012-01-19 18:58:19 +01:00
96644e855a
Set proper minimum height for contacts floater
2012-01-19 18:05:00 +01:00
3ed0520ac4
Fixed wrong panel height in texture preview floater that prevented buttons from being clickable at full height
2012-01-19 17:57:43 +01:00
8e2805150e
Made sidepanel tabs use default caption size and color in Vintage.
2012-01-19 17:28:35 +01:00
83f91ebb77
Fixed parcel icon display getting out of sync in navigation bar and top status bar, made parcel info text left align correctly when icons are hidden, fixed spurious icons showing up when logging in with parcel icons disabled.
2012-01-19 16:33:35 +01:00
69c04414f1
Tooltip updates for channel spinner after prefs shuffling
2012-01-19 13:28:22 +00:00
9d9bec74b8
LLVolume::sculptGetSurfaceArea is costly, do not call it if RenderVolumeSAProtection is off.
2012-01-19 12:37:57 +01:00
de1eeed600
Take featuretable_*.txt and gpu_table.txt from V/dev and assume for now they are the golden master.
2012-01-19 10:41:22 +01:00
9d0e27dce0
Fixed support link in llappviewer.cpp
2012-01-19 09:45:22 +01:00
d71b5df679
Removed leading whitespace in control name in Move & View preferences panel
2012-01-19 09:31:12 +01:00
cb34fe0a31
Fixed alignment of Move & View preferences panel
2012-01-19 09:25:42 +01:00
c3cb15548e
German translation for additional lighting option in preferences
2012-01-19 09:17:19 +01:00
1714747536
After merge compare FS tree agsindt V/dev.
...
- Adjust whitespaces/include order to make FS source look as close to V/dev as possible.
- Include source in V/dev that's not in FS and comment it out with an annotation.
2012-01-18 19:04:59 +01:00
9dab734d5d
Made additional lighting in Edit Appearance optional. Fixes FIRE-4732
2012-01-18 18:46:47 +01:00
1550911aea
FIRE-4071, Additional Pixel Sizing
2012-01-18 00:40:23 -05:00
145868b1cc
FIRE-4071, invite to group button for metaharper skin
2012-01-18 00:30:55 -05:00
25593cfdf5
FIRE-4021, sync metaharper world map to default skin
2012-01-17 21:38:07 -05:00
0d4a3b8e8d
more exception handlings for llcurl fixes.
2012-01-17 17:45:52 -07:00
60f945663d
Use old style menu-rect calculation for now.
2012-01-17 23:46:15 +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
6ef7838cd2
Merge up to 25972:7fceba778ee6 (V/Dev)
2012-01-17 21:15:06 +01:00
73de4b4abe
Enable viewer menu again (had left that out as one of the issues after merging up).
2012-01-17 21:08:23 +01:00
3917ad7031
Added tag V/Dev-to-FSFUI for changeset 931cb0061118
2012-01-17 18:47:29 +01:00
743313916f
Added tag FS_preFUI for changeset a656486925e8
2012-01-17 18:45:52 +01:00
0ad2df4831
Fix merge error: Initialization to mFloaterSnapRegion/mChicletRegion got lost during merge.
2012-01-17 18:44:04 +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
Kadah_Coba