Commit Graph

347 Commits (0b3756aeab22656fd13fa9ccdda0397561ba4ca3)

Author SHA1 Message Date
Nicky 71e61766f5 Merge up to 26006 / c02c9b228b5a (FS tip). 2012-01-19 19:43:35 +01:00
ziree 9dab734d5d Made additional lighting in Edit Appearance optional. Fixes FIRE-4732 2012-01-18 18:46:47 +01: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
Vadim ProductEngine a43b470867 Merge STORM-1577.
Resolved conflicts manually.
2011-10-26 13:41:45 +02:00
Leslie Linden f9e900f5ac * New floater positioning code. Better than what's checked in but not great.
* Floater updates for positioning and to revert some earlier string changes.
2011-10-11 17:36:23 -07:00
Richard Nelson e61da05739 merge with viewer-development 2011-10-05 13:01:29 -07:00
Paul ProductEngine 9d3fc5d930 EXP-1209 FIXED Sidetray removed.
- Removed all sidetray dependencies and the sidetray itself.

- Also removed LLFloaterSidetrayTab and LLSidetrayListener as unused.
2011-09-29 21:43:07 +03:00
Vadim ProductEngine f6a8a2c546 STORM-1612 WIP Implemented new click-to-walk/teleport preferences design. 2011-09-29 15:35:02 +03:00
Paul ProductEngine 8fd2d69fdf EXP-1224 FIXED (Create and register a floater for People side tab)
- Added a floater for People side tab.
- Replaced calls to LLSideTray with LLFloaterSidePanelContainer.
2011-09-27 22:51:43 +03:00
Vadim ProductEngine c80df5ac39 STORM-1612 FIXED Implemented click-to-walk in Advanced mode.
Changes:
* Click and double click in-world can now trigger click-to-walk or
  click-to-teleport actions, depending on preferences.
* Grouped keyboard- and mouse-related settings in Preferences -> Move.
2011-09-23 18:00:35 +03:00
Vadim ProductEngine e23ecf311c STORM-1577 WIP Implemented chat translation preferences management. 2011-09-07 00:09:49 +03:00
Logan Dethrow 05e5ea243e Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings Floater. 2011-08-23 17:06:38 -04:00
Logan Dethrow 61f4c953c4 Fixed a xui widget name mismatch between c++ and xml. 2011-08-22 20:32:10 -04:00
Logan Dethrow cff5251f06 LLProxy: xui string cleanup. 2011-08-12 14:23:43 -04:00
Logan Dethrow 37f8847085 LLProxy: Added another attempt to download gpu and feature tables after successfully setting up a proxy.
Other minor changes:
Clarified why we are using SOCKS5 as the "grid" argument to store proxy credentials.
Added class wide logging to the LLProxy class.
2011-08-04 11:17:03 -04:00
Logan Dethrow d2c72cb7e9 STORM-1112 Input sanitization of proxy options. 2011-07-29 15:38:20 -04:00
Logan Dethrow 0f501293bd merge 2011-07-19 15:06:56 -04:00
Logan Dethrow cb24dff9e3 Code cleanup for the SOCKS 5 proxy viewer. 2011-07-13 16:46:36 -04:00
Aaron Stone 42daa3497b STORM-1482 The Viewer shouldn't overwrite the crash behavior settings, some cleanups to the crash reporters, and the ability to use --set GroupName.SettingName to set parameters outside of the (default) Global settings group. 2011-07-12 15:48:02 -07:00
Logan Dethrow 7717b6f647 STORM-1112 More cleanup of SOCKS 5 proxy code.
Renamed llsocks5.cpp to llproxy.cpp.
2011-06-28 19:54:53 -04:00
Logan Dethrow d5ea63119d Merge 2011-06-21 18:29:50 -04:00
Jonathan Yap ac50481513 STORM-787 Mute Gestures Button 2011-06-12 16:00:33 -04:00
Logan Dethrow 6ce2c20a06 STORM-1112 First pass at cleanup of SOCKS 5 proxy code based on Linden Coding Standard and comments in the code review. 2011-06-10 17:34:00 -04:00
Logan Dethrow 7cb18f5318 Merged STORM-1112 with viewer-development. Fixed license in socks5.cpp and socks5.h. 2011-06-08 15:17:19 -04:00
Logan Dethrow 2662c4b679 Merge. Pulling fix for VWR-25862 into bigger cache tree. 2011-06-01 17:05:38 -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
Leslie Linden a52019d6d1 SH-1521 FIX -- Lighting and Shadows grayed out on mac
* Modified mac feature table to bring it up to date with latest renderer features including deferred rendering
* Changed mac AGL pixel format to no longer allow it to revert to software rendering when shader compilation errors occur.
* Fixed up various GLSL shader compilation warnings and errors that came up as a result of the above changes.
* Changed initial conditions for the "hardware skinning" checkbox on the preferences floater so it can be modified before login on machines that support avatar vertex programs.
* Removed unused avatarAlphaF.glsl files

Reviewed by davep
2011-05-10 14:34:36 -07: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
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 414e797ef2 merge changes for storm-595 2011-04-25 07:33:15 -04:00
Dave Parks 764412f9b5 merge 2011-04-22 11:50:19 -05:00
Oz Linden b15dca2263 merge changes for storm-1095 2011-04-21 20:23:26 -04:00
Don Kjer 01f4570c79 Merge with viewer-development 2011-04-14 18:27:31 +00:00
Paul ProductEngine 8c5207c555 Fixed win build 2011-04-14 15:38:07 +03:00
Paul ProductEngine 8636ed0db7 merge 2011-04-14 15:16:15 +03:00
Vadim ProductEngine 7577ec25a0 STORM-1095 FIX Chat preferences > font size should increase size of input text in the chat box.
Submitting on behalf of Jonathan Yap.
2011-04-14 00:52:40 +03:00
Seth ProductEngine 73cfc64bee STORM-1145 ADDITIONAL FIX Fixed removing the record of user favorites available at login location menu when user switches off this feature.
User favorite locations record is removed from the settings file each time when user exits the viewer with "ShowFavoritesOnLogin" setting off and his name is found on the record.
2011-04-12 02:09:37 +03:00
Paul ProductEngine c4f03ca949 STORM-595 FIXED (The presentation of IM sessions in message well depends on method that was used for opening IM window)
- Added the callback with the timer on control name "ThrottleBandwidthKBPS" changes. Now message is sending to the simulator in 0.3 sec after LAST variable change.
2011-04-08 19:21:21 +03:00
Leslie Linden 6fe4eaf4a0 SOCIAL-872 FIX -- User can toggle Show Me in Search before logging in which updates local settings file but not the actual value in the database
WEB-3750 Attempted FIX -- Gone Profile

* Check box for "show me in search" privacy setting no longer enabled until login.
* Avatar server update message only sent on status change.

Reviewed by Richard
2011-04-07 16:20:23 -07:00
Richard Linden 1d34e7b90b Automated merge with http://hg.secondlife.com/viewer-development 2011-04-06 15:20:51 -07:00
Richard Linden 75ddf612ad Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-2 2011-04-06 15:15:33 -07:00
Leslie Linden 4dd471d055 WEB-3750 FIX - Gone profile
* Added agent validation around calls to update avatar data
 * Removed references to profile panel save options

 Reviewed by Richard
2011-04-06 14:38:55 -07:00
Dave SIMmONs 37c15d211b Merge 2011-04-05 10:36:41 -07:00
Oz Linden 9f4edab4dd pull latest changes from viewer-autobuild2010 2011-04-01 12:12:22 -04:00
Kelly Washington 0080ed8e29 Merge 2011-03-31 14:07:54 -07:00
Robin Cornelius 74d9bf0d55 VWR-20801 Implement SOCKS 5 Proxy for the viewer 2011-03-28 11:20:06 +01:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00