Commit Graph

280 Commits (4f00a13f5ea9bea712a0313562a86cbff07342ad)

Author SHA1 Message Date
Graham Linden a730187a5f Adjust gpu_bench thresholds and move VB set outside loop again for speed 2014-11-18 15:28:29 -08:00
Nat Goodspeed b30c8ed9c5 Comment out now-unused GPU_TABLE_FILENAME in llfeaturemanager.cpp.
The "death to the GPU table" change has commented out the only references to
the GPU_TABLE_FILENAME constant, and Xcode 6.x regards that as an error.
2014-11-14 13:29:14 -05:00
Ansariel 824bdebd79 Merge LL V3.7.22 2015-01-15 14:17:42 +01:00
Tank_Master 93c0ece928 Merge LL v3.7.20 2015-01-15 01:17:02 -08:00
Techwolf Lupindo 7cc00567dc Build fix. 2015-01-13 07:28:03 -05:00
Techwolf Lupindo 13c35f19ef GPU table download bugfix. Process the headers to pick up and set mLastModified. 2015-01-12 20:15:43 -05:00
Tank_Master c3466ac315 Backed out changeset: 6e3af080d67a - benchmark code (prep for later mergeing) 2015-01-10 09:43:21 -08:00
Tank_Master 73d73abfb0 Backed out changeset: d72eff9c793b - benchmark code (prep for later mergeing) 2015-01-10 09:42:58 -08:00
Tank_Master 4530305324 Backed out changeset: 6b7f07b5b1c1 - benchmark code (prep for later mergeing) 2015-01-10 09:42:32 -08:00
Ansariel e1ce6e3d58 Merge Firestorm LGPL tip 2015-01-08 23:12:58 +01:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
davep 4caa2746f3 MAINT-3131 Discard improbably high memory bandwidth measurements on OSX and default to Class 3 2014-09-19 13:01:41 -05:00
Dave Parks d0428575fb Automated merge with http://bitbucket.org/lindenlab/viewer-release 2014-06-19 13:14:42 -05:00
Brad Payne (Vir Linden) 487ca1bad3 v-r -> s-e merge WIP 2014-05-14 17:50:59 -04:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Dave Parks c142696f9d MAINT-3131 Actually fallback to GL version guess instead of treating error value from gpu_benchmark as actual memory bandwidth. 2014-03-21 14:33:46 -05:00
Dave Parks 24f8745914 MAINT-3131 Use benchmark to determine GPU class instead of GPU table. 2014-03-19 17:57:00 -05:00
Brad Payne (Vir Linden) d9e3a2948a merge 2014-03-12 17:24:07 -04:00
Richard Linden 5b846ed2a6 merge with release 2014-03-12 12:48:43 -07:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07:00
Tank_Master 3d1ac7c0ec Merge LL 3.7.3 (Viewer-Bear fixes) 2014-03-17 14:14:15 -07:00
davep df58a78ece MAINT-3131 Discard improbably high memory bandwidth measurements on OSX and default to Class 3 2014-09-19 13:01:41 -05:00
Dave Parks 3043baba56 MAINT-3131 Actually fallback to GL version guess instead of treating error value from gpu_benchmark as actual memory bandwidth. 2014-03-21 14:33:46 -05:00
Dave Parks fbfd010381 MAINT-3131 Use benchmark to determine GPU class instead of GPU table. 2014-03-19 17:57:00 -05:00
Graham Madarasz (Graham Linden) e7021407cb MAINT-3639 disable ALM for OSX 10.6.8 2014-02-11 10:16:11 -08:00
Brad Payne (Vir Linden) 744cf6be8d merge 2013-12-05 10:39:35 -05:00
Richard Linden 34ff2fc46b merge with release 2013-12-02 14:57:29 -08:00
Brad Payne (Vir Linden) 1f8b37e9ad merge 2013-10-16 11:52:43 -04:00
Richard Linden 80dfbbaacd merge from viewer-release 2013-10-08 11:59:24 -07:00
Graham Linden 0103cac1dd Merge viewer-bear maint RC changes to get this build closer to the RC it will follow 2013-09-26 11:44:40 -07:00
Tank_Master 3603c4f992 Merge ll 3.6.11 2013-11-23 20:22:24 -08:00
maksymsproductengine bd0a8c7ee9 MAINT-3128 FIXED Advanced graphical settings are not changing when dragging "Quality and Speed" slider 2013-09-11 00:41:10 +03:00
Richard Linden 52da9f5f49 merge with viewer-release 2013-09-09 18:58:41 -07:00
Oz Linden 980802e468 STORM-1552: detect, ignore, and delete invalid feature and gpu table files 2013-09-05 22:06:16 -04:00
Brad Payne (Vir Linden) 144eb1912d merge 2013-09-04 13:41:51 -04:00
Richard Linden 612892b45a SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 ms
continued conversion to units system
made units perform type promotion correctly and preserve type in arithmetic
e.g. can now do LLVector3 in units
added typedefs for remaining common unit types, including implicits
2013-08-18 22:30:27 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden a2e22732f1 Summer cleaning - removed a lot of llcommon dependencies to speed up build times
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
Nat Goodspeed c08b60ac6f CHOP-959: Streamline processing for --graphicslevel switch.
Use map-to in cmd_line.xml to inform the command-line processor that the
target variable for --graphicslevel is RenderQualityPerformance.
That lets us eliminate clunky llappviewer.cpp switch from '0' to 0, etc.
Moreover, previous switch statement only accepted 0 - 3, whereas
LLFeatureManager::setGraphicsLevel() actually accepts 0 - 6. Introduce
LLFeatureManager::isValidGraphicsLevel() and use that to validate.
Replace switch statement in setGraphicsLevel() mapping int constants to string
literals with static vector of level names, using same data for mapping as for
validating level numbers.
2013-06-28 15:26:18 -04:00
Brad Payne (Vir Linden) a04a706c1b merge 2013-05-21 16:18:48 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Don Kjer f945415210 Large changes to the LLCurl::Responder API, as well as pulling in some changes to common libraries from the server codebase:
* Additional error checking in http handlers.
* Uniform log spam for http errors.
* Switch to using constants for http heads and status codes.
* Fixed bugs in incorrectly checking if parsing LLSD xml resulted in an error.
* Reduced spam regarding LLSD parsing errors in the default completedRaw http handler.  It should not longer be necessary to short-circuit completedRaw to avoid spam.
* Ported over a few bug fixes from the server code.
* Switch mode http status codes to use S32 instead of U32.
* Ported LLSD::asStringRef from server code; avoids copying strings all over the place.
* Ported server change to LLSD::asBinary; this always returns a reference now instead of copying the entire binary blob.
* Ported server pretty notation format (and pretty binary format) to llsd serialization.

* The new LLCurl::Responder API no longer has two error handlers to choose from.  Overriding the following methods have been deprecated:
** error - use httpFailure
** errorWithContent - use httpFailure
** result - use httpSuccess
** completed - use httpCompleted
** completedHeader - no longer necessary; call getResponseHeaders() from a completion method to obtain these headers.

* In order to 'catch' a completed http request, override one of these methods:
** httpSuccess - Called for any 2xx status code.
** httpFailure - Called for any non-2xx status code.
** httpComplete - Called for all status codes.  Default implementation is to call either httpSuccess or httpFailure.
* It is recommended to keep these methods protected/private in order to avoid triggering of these methods without using a 'push' method (see below).

* Uniform error handling should followed whenever possible by calling a variant of this during httpFailure:
** llwarns << dumpResponse() << llendl;
* Be sure to include LOG_CLASS(your_class_name) in your class in order for the log entry to give more context.

* In order to 'push' a result into the responder, you should no longer call error, errorWithContent, result, or completed.
* Nor should you directly call httpSuccess/Failure/Completed (unless passing a message up to a parent class).
* Instead, you can set the internal content of a responder and trigger a corresponding method using the following methods:
** successResult - Sets results and calls httpSuccess
** failureResult - Sets results and calls httpFailure
** completedResult - Sets results and calls httpCompleted

* To obtain information about a the response from a reponder method, use the following getters:
** getStatus - HTTP status code
** getReason - Reason string
** getContent - Content (Parsed body LLSD)
** getResponseHeaders - Response Headers (LLSD map)
** getHTTPMethod - HTTP method of the request
** getURL - URL of the request

* It is still possible to override completeRaw if you want to manipulate data directly out of LLPumpIO.

* See indra/llmessage/llcurl.h for more information.
2013-03-13 06:26:25 +00:00
Graham Madarasz 3c5ac77a92 For MAINT-2157 Codereview: DaveP 2013-02-07 09:02:51 -08:00
Tank_Master 119ce81029 Merge viewer bear updates + merge fixes 2013-09-23 22:10:59 -07:00
Tank_Master 52d9b07503 Merge viewer-bear 2013-09-12 21:15:34 -07:00
Tank_Master 5a8d94c50f Merge LL 3.6.4 pass 1 2013-08-28 00:10:39 -07:00
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
Nicky 3b94a2f8de Properly handle unicode pathnames in llfeaturemanager under Windows. 2013-06-17 16:53:20 +02:00
Techwolf Lupindo 91363ed5bf Downloadable gpu/feature table support.
Backout changesets 22574/c36e39f86509 22769/922e34c3d661 22766/b729996184e5 by hand.
Change filename saved/downloaded to shortVersion instead of fullVersion.
Added "last modified" for proper cacheing of the downloaded files.
2013-06-14 00:43:35 -04:00
Dave Parks 954ebaed84 Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2013-01-08 13:40:59 -06:00
simon@Simon-PC.lindenlab.com 716e2ea3b1 Pull and merge viewer-development 2012-12-12 10:58:47 -08:00
Nat Goodspeed e1da5bda78 merge changes for DRTVWR-257 2012-12-05 18:18:16 -05:00
Dave Parks 1f2b88803e MAINT-1953 Run through viewer stats and update GPU table with missing entries and new expected OpenGL versions 2012-12-04 16:10:15 -06:00
Dave Parks e83700b56d MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers.
Reviewed by Simon
2012-11-30 17:03:12 -06:00
Dave Parks 73d1b4f79c MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Dave Parks 4aa818055e MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
Reviewed by Simon
2012-11-26 13:22:25 -06:00
Dave Parks ccef9ab267 MAINT-2086 Separate GPU class from settings more completely to avoid GPU dependent behavior when manually adjusting detail slider. 2012-12-12 16:42:06 -06:00
Dave Parks fd3cbbaa27 MAINT-2090 Make gcc happy 2012-12-12 15:23:50 -06:00
Dave Parks e0bc069af2 MAINT-2090 Never enable lighting and shadows by default on OS X 2012-12-12 14:52:36 -06:00
Nat Goodspeed b6f0921099 Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased 2012-09-06 19:02:39 -04:00
Dave Parks 9611356556 MAINT-1491 Integration of statistically generated GPU table -- enable shadows by default where appropriate. 2012-08-28 13:52:14 -05:00
Tank_Master 5494524b61 Update graphics defaults based on team vote
Used code in llfeaturetable instead of modifying goutable to reduce merge conflicts
Changed some geforce cards to openGL 4.2 to not get propted to update when already on latest driver.
2013-02-02 23:17:03 -08:00
Tank_Master 169263d8b0 Merge LL 3.4.5 beta 3 2013-01-28 01:56:00 -08:00
Tank_Master bab1c95df8 Increase max defaultable graphics level to mid-high for OSX
We don’t have deferred rendering enabled at this level, unlike LL
2013-01-21 15:43:51 -08:00
Tank_Master 88f2332505 redisable defaulting of RenderCompressTextures on in some cases 2013-01-03 23:49:48 -08:00
Tank_Master cc44316aed Merge LL 3.4.3,
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
2012-12-18 00:36:35 -08:00
Dave Parks f5254d532b MAINT-1262 Fix for crash when setting graphics to Low 2012-07-12 16:53:31 -05:00
Tank_Master cb24ec2e0d merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
2012-07-16 21:59:14 -07:00
Dave Parks 513c1d9744 SH-795 Potential fix for crash after setting graphics detail to low. 2012-03-20 16:05:29 -05:00
Tank_Master db0761845d disable use of texture compression in feature table, fixes FIRE-6792 and FIRE-6767
RenderCompressTextures will be set to disabled for all systems by default
RenderCompressTextures can be enabled in preferences -> graphics -> hardware should the user want it enabled
2012-06-30 10:30:31 -07:00
Tank_Master f2a9376865 Add file name into copyright info on growl files and disable logging growl messages on Linux 2012-06-30 09:08:47 -07:00
Tank_Master bddd3cbe9a enable texture compression by default on systems with a nvidia card or has less than 480MB vid ram 2012-06-22 17:34:34 -07:00
Tank_Master 991d43709c merge LL 3.3.3 beta 2012-06-16 07:22:27 -07:00
Dave Parks 83e69659e2 MAINT-708 Add checkbox to hardware settings for controlling texture compression. Default texture compression to on for cards with 512MB of VRAM or less, off otherwise. 2012-03-08 15:22:56 -06:00
Tank_Master a8a7f4d0f5 Correction to 26918 - Lets actually disable texture compression by default instead of enabeling it... 2012-03-14 07:58:47 -07:00
Tank_Master 59a742505d disable texture compression by deafult for all memory amounts, remove option from preference 2012-03-12 15:52:40 -07:00
Tank_Master ba95bbc8a3 MAINT-708 Add checkbox to hardware settings for controlling texture compression. (By DaveP)
Default texture compression to on for cards with 512MB of VRAM or less, off otherwise.
2012-03-08 23:13:29 -08:00
Nicky 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
Dave Parks f5b10238af SH-2240 Forcibly disable shaders on hardware that's specifically flagged as unsupported. 2011-10-24 13:10:26 -05:00
Dave Parks 1762cc4939 SH-2570 Don't minimize viewer when reloading shaders (revert hack that didn't work) and pause shader loading until after all feature masks have been applied when switching detail levels 2011-10-20 14:20:12 -05:00
Richard Linden 25f1653ca0 EXP-1080 FIX Console gets spammed with VertexShaderEnable messages making the viewer unusable
converted LL_WARNS to LL_WARNS_ONCE
2011-08-11 14:21:20 -07:00
Dave Parks f1443579b3 SH-2038 Potential fix for a myriad of performance problems concering VBO usage. 2011-07-09 02:28:34 -05:00
Loren Shih 303a59e7bc dos2unix fixes for newview files. 2011-05-26 14:16:56 -04:00
Loren Shih 781addcbc1 Automated merge up from viewer-development into mesh-development 2011-05-20 11:41:28 -04:00
Leslie Linden 19a06478d9 SH-1618 FIX -- Lighting and shadows crash ATI macs
* Fixed ATI mac "lighting and shadows" related crash
* Fixed up numerous GL errors on macs related to multiple color formats,
  the use of glEnable/glDisable on textures above the texture unit count
  and old ATI-specific code that was not appropriate for Mac.
* Disabled SSAO for ATI macs due to it not working with shadows
* Ongoing work to properly get shadows and SSAO functioning on ATI macs is required.

Reviewed by davep
2011-05-19 17:28:23 -07:00
Oz Linden 5eb6cb8d86 merge up latest viewer-development (post mesh) 2011-05-18 07:33:08 -04:00
Oz Linden 27fd0d1a93 storm-1100: merged many more updates and refinements to table, added tester and files to test with 2011-05-13 13:27:56 -04:00
Leslie Linden 4268700fcf SH-1521 update -- Lighting and Shadows grayed out on mac
* Disabled SSAO on macs with 8 or less texture units.
* Slight cleanup of sunlight fragment shaders to remove unused texture units.

Reviewed by davep
2011-05-12 13:30:47 -07:00
Oz Linden 2eb19ccc13 STORM-1100 (diagnosis) improve logging to aid in debugging recognition errors 2011-04-15 20:46:31 -04:00
Dave Parks 5fd953df8f SH-874 Properly detect available video memory on ATI cards and disable vertex buffer objects when available vram is under 256MB. 2011-03-10 00:41:46 -06:00
Dave Parks 8f9edd3874 SH-534 Don't allow deferred rendering to be enabled on windows PC's with GL version less than 3.0. 2011-02-08 17:19:54 -06:00
Aleric Inglewood 9b341ec012 VWR-24317: remove warning caused by reading the last line of the featuretable twice 2011-01-20 15:03:48 -05:00
Selo eced4c97bc FIX FIRE-2209 Don't use any stray Feature_table.version.txt in USER_PATH 2011-10-03 23:58:54 +02:00
Selo 6cfab19a9d Fix FIRE-2209 - Prevent stray GPU_table.version.txt being downloaded to USER PATH 2011-10-03 23:32:54 +02:00
Tank_Master 3a8d53929f Stop trying to fetch GPU and feature tables from LL. 2011-09-12 23:16:19 -07:00
Richard Linden 7e9482a670 EXP-1080 FIX Console gets spammed with VertexShaderEnable messages making the viewer unusable
converted LL_WARNS to LL_WARNS_ONCE
2011-08-11 14:21:20 -07:00
Dave Parks 35ad7ace90 Add featuretable_xp, set default VolumeLODFactor to 0.5 for class 0 hardware, and disable impostors on Intel 965 on xp. 2010-09-01 17:55:56 -05:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Karl Stiefvater (qarl) d0a8ae4557 EXT-7910 allow GPU and feature table to load from a custom location 2010-06-18 12:33:17 -05:00
Karl Stiefvater (qarl) e3753ed8b2 S3 feature/gpu table implementation. reviewed by palmer and davep. 2010-05-21 16:11:21 -05:00
Tofu Linden 7462911bdd Change Linux fasttimer implementation back to RDTSC - using a reliable syscall was REALLY chewing CPU time. Sigh. I didn't realize how incredibly often this gets called. So, back to the assembly.
But be more careful with CPU clock count on linux, so the fasttimer values are much more accurate than they were the last time we were with RDTSC, in absolute terms - back in the right order of magnitude anyway.

Also change many instances of Mhz to MHz.
Also some minor comment fixes.
2010-04-19 12:49:15 +01:00
Tofu Linden 63e421d3b3 CID-64
Checker: FORWARD_NULL
Function: LLFeatureManager::loadFeatureTables()
File: /indra/newview/llfeaturemanager.cpp

not a bug.
2010-02-11 14:15:41 +00:00
brad kittenbrink a7efd0d8dd Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so I'll need to rebuild that, plus a couple other minor clenaups. 2009-07-30 19:39:08 -07:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
James Cook d6101558a1 Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also UI color refactoring and new FreeType font library on Linux.
svn merge -r126038:126164 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-5
2009-07-06 21:58:04 +00:00
Brad Kittenbrink 01d390825a DEV-27646 dll linkage for login module.
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.

reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
2009-05-22 23:27:16 +00:00
Aaron Brashears 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
Mark Palange fb793870fe QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
2008-12-23 19:39:58 +00:00
Mark Palange 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
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Eric Tulla e77de5d685 Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .
Passed QA as part of QAR-491.
2008-05-14 21:37:13 +00:00
Steven Bennetts 941cb9f412 merge release@83343 skinning-1-merge@83714 -> release
QAR-424
2008-04-01 17:45:04 +00:00
Steven Bennetts e3b97ac65b merge release@82383 viewer-cleanup2-7-merge@82828
QAR-369
2008-03-20 21:41:26 +00:00
Steven Bennetts 672a76d0ea reverting premature commit at 82410. 2008-03-15 01:18:27 +00:00
Mark Palange 04611efae8 [NOTE: This was an erroneous commit, and was reverted in the next revision]
QAR-369 - viewer-cleanup2-7 81916 merged into release.
2008-03-14 23:21:38 +00:00
Steven Bennetts 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
Brad Kittenbrink 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
Don Kjer facf67ae32 EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
Steven Bennetts 050dad0ce3 merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079 2007-11-07 22:55:27 +00:00
Aaron Brashears 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
Christian Goetze 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
Don Kjer d373dcc7cb svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269
2007-07-20 20:38:05 +00:00
Adam Moss 208ccf8c2c SL-24485, SL-40331, SL-23136, SL-40330, SL-25816, SL-40567,
SL-40568: land moss/linuxmisc-r60383: misc linuxclient & opensource
fixes.

svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@60383
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/linuxmisc-r60383 ->
release
2007-04-18 09:17:53 +00:00
Josh Bell 0277259455 svn merge -r 59968:60342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release 2007-04-11 17:54:18 +00:00
Steven Bennetts 4dabd9c047 merge release@58699 beta-1-14-0@58707 -> release 2007-03-02 21:25:50 +00:00
Aaron Brashears 305c74d516 Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release. 2007-02-02 17:28:58 +00:00
Steven Bennetts 7f50e28b0f merge -r 56842:57026 maintenance. 2007-01-23 19:12:31 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00