Commit Graph

672 Commits (7029c8ff534419a3bcfd0e5fc39a4739e4cdc19c)

Author SHA1 Message Date
Oz Linden f8f9e089e1 merge up latest viewer-development 2011-06-09 16:28:57 -04:00
Logan Dethrow 18a2c3c017 VWR-25965 Fix to two calls to LLDirIterator mask argument.
Removed two cases in llappviewer.cpp where the mask argument to LLDirIterator
had a leading delimiter.
2011-06-06 17:40:19 -04:00
Oz Linden 336d3c15c4 merge changes for viewer-development 2011-06-06 11:40:10 -04:00
Logan Dethrow 7b949262fe Merge. 2011-06-02 14:53:58 -04:00
Oz Linden 8bfd3201de merge changes for latest viewer-development 2011-06-01 22:07:12 -04:00
Oz Linden 147567349e pull back fix for storm-1298 from beta branch 2011-06-01 19:05:36 -04:00
Logan Dethrow 2662c4b679 Merge. Pulling fix for VWR-25862 into bigger cache tree. 2011-06-01 17:05:38 -04:00
Xiaohong Bao b100f1d2d4 fix for STORM-1298: Crash on startup of Second Life 2.7.1(231307) 2011-06-01 12:09:40 -06:00
Oz Linden 2002a39e4d merge changes for storm-1296 2011-06-01 07:22:57 -04:00
Oz Linden e9501b855b merge changes for storm-1299 2011-06-01 07:21:09 -04:00
Oz Linden fb9ef62331 storm-1189: remove classic clouds 2011-05-26 06:31:11 -04:00
Xiaohong Bao 8c97ed86ff fix for SH-1624: Crash during viewer startup: LLViewerTextureList::addImageToList 2011-05-25 14:38:53 -06:00
Logan Dethrow 57bdcd6bda VWR-25862 Potential fix for caches not clearing when they are supposed to.
* Removed leading delimiter from filename mask in all calls to
  LLDir::deleteFilesInDir() that are related to the viewer asset caches
  (texture, VFS, and VO).
2011-05-25 15:44:03 -04:00
Dave SIMmONs d6f7526abf Merge 2011-05-24 14:28:25 -07:00
Oz Linden 551d17f819 merge latest changes (post-2.7.0) from viewer-development 2011-05-23 11:38:33 -04:00
Logan Dethrow 4b97f03b04 Revamped viewer cache preference controls.
Implemented improved cache control user interface, changes approved by wolf.
* Moved viewer cache controls from the setup preference panel to advanced
* Changed cache size control slider into a spinner
* Readded a clear cache button along with a cache clear confirmation dialog
* Renamed the reset button to "Default Location" to clarify its function

Related JIRAs:
ER-815
ER-816
ER-818
ER-820
ER-821
ER-831
2011-05-20 16:00:36 -04:00
Don Kjer 0a86e39d90 Merge with viewer-development (mesh) 2011-05-17 21:01:36 +00:00
Oz Linden 55665d99a4 un-hardcode the viewer name merged in from the mesh branch 2011-05-17 16:54:51 -04:00
Don Kjer ae8ed3fc2d Merge with viewer-development 2011-05-17 19:21:55 +00:00
Vadim ProductEngine 001b9e5ae3 Merge from viewer-development. 2011-05-17 21:53:10 +03:00
Dave Parks 8a92612fd9 merge 2011-05-16 12:34:15 -05:00
Oz Linden 8f7a6f8312 merge changes to improve build times 2011-05-13 08:47:24 -04:00
Seth ProductEngine e213a36f70 STORM-477 Restored the backed out changeset: b62b260aa04d 2011-05-11 18:12:23 +03:00
Logan Dethrow 39ad3f1d88 merge 2011-05-06 15:25:12 -04:00
Logan Dethrow 5c7a906b44 Increased the viewer cache size limit to 10GB. Increased the default to 1GB.
* Changed the hard coded cache limit in llappviewer.cpp to 10GB as well as the
   slider maximum in the preferences menu. * The VFS cache is capped at 1GB due
   to file system limitations. The former 80/20 split between texture/vfs is
   maintained up to 5GB. Above this limit the texture cache is given all
   the additional cache space up to 10GB.
 * Fixed a log message in lltexturecache.cpp that was not showing the correct
   texture size. ER-883
 * Fixed a bug in llfloaterpreference.cpp that caused new cache value to be
   written to the old cache setting. This resulted in the the cache not being
   cleared when the location was set back to the default. ER-882
 * Disabled the "The cache will be cleared on reboot" message that is triggered
   by the reset button in the cache preferences in the case where the cache
   is already located in the default location.  The cache is only cleared when
   its location is changed. This is intended to address resident confusion
   regarding the purpose of the reset button, as demonstrated in VWR-19562.
2011-05-06 15:15:17 -04:00
brad kittenbrink dbc92691a6 Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies. 2011-05-05 17:13:52 -07:00
Dave Parks a25f898703 merge 2011-05-02 14:52:12 -05:00
Don Kjer c14b5c644d Merge with viewer-development 2011-04-26 18:01:18 +00:00
Oz Linden c3df5f5d67 merge up latest viewer-development 2011-04-22 18:25:57 -04:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Oz Linden 49ecf8efbc merge back fixes for STORM-1088 and (possibly) STORM-1141 2011-04-21 14:30:58 -04:00
Don Kjer ee2cea657a Merge with viewer-development 2011-04-19 21:50:08 +00:00
Oz Linden 9c995e2a5c merge up from viewer-development (with changes for storm-160 backed out) 2011-04-18 16:25:02 -04:00
brad kittenbrink dab937ef5b FIX: STORM-1141. Win7: 2.6.3 Beta1 crashes on startup if locale differs from English.
Force LLTextureCache::purgeAllTextures to get called in addition to normal cache purging.
2011-04-15 16:45:19 -07:00
Oz Linden 67eb368bb2 merge changes for storm-1083 2011-04-15 14:59:25 -04:00
Don Kjer 01f4570c79 Merge with viewer-development 2011-04-14 18:27:31 +00:00
Oz Linden 6bdfc3d048 merge out changes up to but not including the STORM-610 change 2011-04-13 12:03:53 -04:00
Paul ProductEngine 6f64469cdd STORM-1083 FIXED Using -login client parameter always results in a last location unavailable error message
- In case of using "login" or "autologin" command-line parameters, URL of the start location should be set during configuration initialization of application. This is because there won't be ability to set it before login state (panel login won't be shown).
2011-04-08 20:09:45 +03:00
Richard Linden 1d34e7b90b Automated merge with http://hg.secondlife.com/viewer-development 2011-04-06 15:20:51 -07:00
Vadim ProductEngine a2c4bb8049 STORM-1126 merge 2 2011-04-05 20:47:39 +03:00
Oz Linden b5c834c6fd merge changes for STORM-1051 2011-04-05 07:23:43 -04:00
Richard Linden 80efbeead1 merge 2011-04-01 18:23:13 -07:00
Don Kjer d292053c04 Merge with viewer-development 2011-04-01 23:37:30 +00:00
Vadim ProductEngine 5a0547cdc3 STORM-1126 merge 2011-03-31 18:46:56 +03:00
Linden Staff@LINDEN-E5E9EA17.lindenlab.com dfb243cd95 SOCIAL-853 FIX As a new user, I would like Second Life to start up with a maximized window to fully immerse myself in the experience
* Added virtual meetsRequirementsForMaximizedStart() function to determine whether or not to start the initial experience in a maximized window

 Reviewed by Richard
2011-03-30 16:20:59 -07:00
Dave SIMmONs 3c8f6f44dc Fix usage of flag SLURLPassToOtherInstance during login. 2011-03-28 10:22:01 -07:00
Oz Linden fb1facf13a syncing up to viewer-development 2011-03-24 13:22:43 -04:00
Don Kjer 1e0608ff51 Merge with viewer-development 2011-03-23 01:26:03 +00:00
Richard Linden 2a83929a58 SOCIAL-762 FIX Viewer crash if first startup (with cleared settings.xml file) is in Advanced mode
fixed not being able to change to advanced mode on clean install without logging in
2011-03-19 00:59:17 -07:00
Richard Linden a024493c04 eol fixes 2011-03-15 13:36:23 -07:00