599e081815
Backed out changeset: d5795c04fecc
2019-02-23 20:08:03 +02:00
150faaf53c
Backed out changeset: f1fa95a76b9a
2019-02-23 20:06:46 +02:00
76369c2463
SL-10288 comments cleanup
2019-01-03 14:30:01 +02:00
efa5f24d1b
SL-10288 Mesh uploader changes from Firestorm
2019-01-03 00:35:38 +02:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
1f6e20c5bb
Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTexture
2012-09-04 17:43:08 +00:00
5ee461ab19
merge
2012-08-08 15:52:54 -07:00
1f234f8593
merge
2012-06-27 11:33:19 -04:00
fd578f1136
MAINT-654 Potential fix for corrupt avatar bakes on some AMD systems.
2012-06-26 15:44:02 -05:00
99c1c64aa4
SH-3172 WIP - fix
2012-06-26 16:05:03 -04:00
08a621f050
MAINT-1092 Fix for broken avatar bakes on some AMD graphics cards.
2012-05-17 18:34:14 -05:00
8c15a7e17f
SH-2902 Fix for avatar bakes etc. getting garbage data sometimes.
2012-02-07 14:51:30 -06:00
9ea41c8094
SH-2243 No deprecated calls for the whole session.
2011-09-20 00:54:37 -05:00
c0ca2c62fd
merge
2011-09-13 16:11:22 -05:00
c8b8b153f1
SH-2242 Don't make LLDynamicTexture targets use shaders all the time (revisit later).
2011-08-27 00:48:14 -05:00
db92b03691
SH-2242 Start using "no fixed function" when rendering dynamic textures.
2011-08-10 14:49:11 -05:00
14f6bbadef
SH-2242 Work in progress migrating to glVertexAttrib everywhere
2011-08-08 15:29:23 -05:00
01cdeb0cdd
Merge from viewer-development
2011-02-23 10:44:59 -07:00
ba1266043f
trivial: for VWR-22353: remove debug code for EXT-6791.
2011-01-07 15:04:36 -07:00
f4ff1430f0
first iteration of memory pool code
2010-12-03 22:16:16 -07:00
2969599880
a try to fix EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-30 18:06:45 -06:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
b064285da3
fix for EXT-8730: crash at llrender/llimagegl.cpp(157) : error ERROR: checkTexSize: wrong texture size and discard level: width: 512 Height: 512 Current Level:
2010-08-23 16:16:41 -06:00
17553add7c
added a toggle "LLGLManager::mDebugGPU" for debugging certain CPUs.
...
added more debug code for EXT-6791: [crashhunters] Intel 965 Crash in glCopyTexSubImage2D
2010-08-23 11:32:58 -06:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
731086241b
EXT-8457: FIXED: crash at [1] LLImageGL::checkTexSize(bool) [secondlife-bin llimagegl.cpp]
2010-07-22 11:28:16 -06:00
0dee7a3ece
debug code for EXT-6791: Intel 965 Crash in glCopyTexSubImage2D.
2010-04-09 22:02:32 -06:00
7d3b3cc474
Linker optimization - use "extern template" for commonly regenerated templates
...
Also replaced many duplicate calls to LLViewerCamera::getInstance() with local pointer.
Reviewed with Ambroff
2009-11-30 14:41:52 -08:00
0f6242d9fd
Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect (scaled vs. raw)
...
Reduces chance of future UI bugs related to UI size.
Discussed with Richard.
2009-11-10 14:00:38 -08:00
35e200881c
merge QAR-1829: texture pipeline branch in viewer-2.0.0.3
2009-11-06 06:52:24 +00:00
77f56a3f3d
merge QAR-1579: texture-cleanup-1.
2009-07-10 22:02:26 +00:00
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
abdc99f21b
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
...
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
2009-02-18 21:10:16 +00:00
446c55538e
svn merge -r106055-107012 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer_1-22/
...
merge RC5 changes into trunk, plus add'l localization xml (all newly added) files that should have been added with RC0-RC4 merge, but weren't.
2009-01-13 03:46:56 +00:00
e3cf284388
Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2009-01-08 00:05:06 +00:00
f89f19990c
QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_combo_1-22-merge into linden/release
2008-11-07 17:51:03 +00:00
d725e5b240
QAR-872 Viewer 1.21 RC 3
...
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
ad33281007
QAR-650 - Viewer RC 9 merge -> release (post cmake)
...
merge release@88802 Branch_1-20-Viewer-2-merge-1@89178 -> release
2008-06-06 22:43:38 +00:00
63e7894148
QAR-570 maint-render-4 merge
...
merge -r 87067:87077 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-4-merge -> release. dataserver-is-deprecated.
2008-05-08 18:41:20 +00:00
16baf6c9d4
merge release-QAR-499 Viewer 1.20 RC 3
...
merge release-QAR-508 Viewer 1.20 RC 4
merge Branch_1-20-Viewer -r 85278 : 85828 -> release
2008-04-28 23:29:46 +00:00
941cb9f412
merge release@83343 skinning-1-merge@83714 -> release
...
QAR-424
2008-04-01 17:45:04 +00:00
377ae59c21
merge Branch_1-19-1-Viewer -r 80930 : 81609 -> release
...
DEV-11202: Unhandled Excpetion in pipeline.cpp.
Merged over updated windlight ui help text from windlight14.
Reverting a const change in a virtual that was not propagated to all overrides.
DEV-10957 stop and pause Media and music buttons do not work
DEV-10762 Displayed page in the client browser disappears when crossing property boundaries.
DEV-11220 replace misspellings in alerts.xml parameters of 'messsage'
DEV-11221 fix a misspelling of 'participants' in floater_chat_history.xml tooltip
DEV-11193 clean up some viewer strings related to Windlight help text
svn merge -r81144:81147 svn+ssh://svn/svn/linden/branches/1-19-1-viewer-threads
DEV-11110 Media browser history dropdown does not save items across sessions
Ran the xuiparse -process tool on all en-us xml files. This does NOT change any data, merely reorders attributes and cleans up tab/spacing.
DEV-11349 XML CLEANUP: fix duplicate sibling names in en-us xui files
DEV-11348 Change to llmimetypes.cpp broke Media Type dropdown
dev-10623 "parcels that played movies no longer work in combo-merge-ui"
DEV-11379 - crash in LLTabContainer::draw()
DEV-11377 Elminiate dangerous LLLinkedList and LLDoubleLinkedList from newview
DEV-11158 sculpties on the top10 crash list
DEV-11404 "Send Current URL to Parcel" does not set the MIME type
merge 80958:80959 maint-ui-9-qa, DEV-11105 -- Searching for people with 3 characters like "j l" hurts the database.
DEV-10489: no draw distance cheating
DEV-879: water noise frequency
DEV-10764: macbook air support
DEV-10878: Linux Intel945 support
DEV-7551: featuretable adjustments for framerate.
DEV-11426 Enormous mini-map.
DEV-11505 - Crash in gunzip_file.
Removed final LinkedList, SkipMap, and AssocList templates from the Viewer!
DEV-11115 truncated word in the Advanced Water Editor's modal help dialog
2008-03-11 01:47:36 +00:00
6d52efe452
Merge of windlight into release (QAR-286). This includes all changes in
...
windlight14 which have passed QA (up through r79932).
svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
2008-02-27 18:58:14 +00:00
5595a99623
Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-10-04 23:19:43 +00:00
ce0a5fe145
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
...
Actual action: branched maintenance-r68118, merged in release, then copied result into release
2007-08-21 22:17:53 +00:00
c93c38e047
svn merge -r 59178:59364 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
2007-03-21 19:36:11 +00:00
AndreyL ProductEngine