088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
9fdca96f8b
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-08 20:27:14 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
cf8c7701df
STORM-1221 FIXED Hard coded dates made localizable under Group Profile Land/Assets.
...
Added a function for parsing a date string of specific format.
Added strings defining the date format in Group Profile Land/Assets that should be localized.
2011-07-19 20:04:24 +03:00
c797cf6500
STORM-1136 FIXED LLDateUtil class defines March having 21 days, causing wrong avatar age calculation
...
- Applied patch which fixes typo in enum.
2011-04-13 19:50:51 +03:00
9fd0edb326
Initial 2.8.3+ merge, Tozh & Arrehn
...
Issues: Graphics preferences tab, lighting, depth of field
Issues: Color preferences tab, new direct chat
Issues: Build floater Mesh build tab
Issues: German translations of build, viewer menus
Issues: pipeline issues with mac, possibly other things
Issues: uploading content / temp content
Issues: Windlight quickprefs, parcel windlight, RLVa windlight
2011-08-26 11:18:49 -04:00
8ad5687203
Fix date calculations to use 31 days for March, not 21. From Ansariel Hiller, fixes FIRE-837.
2011-04-12 12:25:42 -05:00
68c03b9e24
Show avatar age in days as well, and use consistent ages across the interface. From Ansariel Hiller, fixes FIRE-315.
2011-03-27 08:40:07 -05:00
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
5aa8b5d37e
Clean up merge, dueling LLDateUtil refactoring
2010-05-11 17:27:14 -07:00
257c3ed2a3
LLDateUtil::ageFromDate() now takes more sensible parameters
...
This and last reviewed with Kelly
2010-04-20 16:06:25 -07:00
6d1e44b033
Avatar picker requests are routed via sim capability
2010-04-20 14:52:09 -07:00
d88a465a46
Fixed bug EXT-6842 ([I18N] Date format in Profile - mm/dd/yyyy needs to be: yyyy/mm/dd for Japanese).
...
- Made avatar registration date localizeable.
- Specified localization templates for English, Japanese and German.
Reviewed by Mike: https://jira.secondlife.com/browse/EXT-6842
--HG--
branch : product-engine
2010-04-19 17:56:09 +03:00
305ec89a70
Added ageFromDateISO() for YYYY-MM-DD dates
2010-02-23 16:33:43 -08:00
cffe23df08
EXT-3921 [BSI] Age calculation fails on Mac and Linux
...
Was accessing wrong value out of days-per-month array, and
stepping off end of array for December.
Reviewed with Richard.
2010-01-05 15:46:40 -08:00
c4298c4f37
Remove unused date code after review with Leyla. Will unbreak Mac build.
2009-11-20 10:25:02 -08:00
7ab6dc37f8
EXT-1743 People inspectors should show Age, not Date born, fixed date math
...
Changed date math to correctly account for month lengths and leap years.
Extended unit test.
Review pending.
2009-11-18 19:21:09 -08:00
ada0f4fa22
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
...
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Ansariel