Commit Graph

95 Commits (ffe475e96e9cdd2bb3c66fd3ffeef2b4d64bc33b)

Author SHA1 Message Date
Tofu Linden e416840f85 Backed out changeset c3d41f18ce2b
back-out the back-out for this branch.  yay.
2010-08-24 19:22:00 +01:00
Tofu Linden 98cc236503 Backed out changeset a62bf7c0af21
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
Tofu Linden 6ba23344c9 merge heads. whew. 2010-08-24 18:37:53 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks f740214f9d Porting VBO changes from davep/viewer-release.
Better usage of LLVertexBuffer::sEnableVBOs.
Added RenderUseStreamVBO debug setting for controlling usage of VBOs for particles/avatars/etc.
2010-06-28 16:09:36 -05:00
Leyla Farazha a6cf0bed74 Merge from ssh://hg.lindenlab.com/dessie/viewer-release 2010-06-21 11:24:33 -07:00
Andrew Polunin 2c5af9672c EXT-5808 FIXED Added another context menu. Also Navigation Bar and Mini-Location bar are mutually exclusive now
- Implemented context menu for Mini-Location bar (menu_topinfobar.xml)
- Implemented function show_topinfobar_context_menu() (in llviewermenu.h) which displays context menu for Mini-Location bar.
- Functions toggle_show_navigation_panel() and toggle_show_mini_location_panel() modified so that Navigation Bar and Mini-Location bar are mutually exclusive (when the former is visible the latter is hidden and vice versa).
- Implemented method LLPanelTopInfoBar::onContextMenuItemClicked which handles \"landmark\" and \"copy\" Mini-Location bar context menu actions.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/607/

--HG--
branch : product-engine
2010-06-18 15:58:00 +03:00
Tofu Linden 23a5f47f4a merge from viewer-public 2010-06-04 11:16:32 +01:00
Andrew Polunin 5609f78f45 EXT-5808 FIXED Mini-Location panel was added below Navigation Bar
- Implemented class LLPanelTopInfoBar (llpaneltopinfobar.h, llpaneltopinfobar.cpp, panel_topinfo_bar.xml). Most of it's implementation is borrowed from LLLocationInputCtrl class.
- Mini-Location panel is turned off by default.
- Added top bar context menu option \"Show Mini-Location Panel\".
- Mini-Location panel displays the same context menu as top bar.
- Added code to initialize LLPanelTopInfoBar in llviewerwindow.cpp.
- Added declaration of the widget in main_view.xml

Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/464/

--HG--
branch : product-engine
2010-06-03 18:59:16 +03:00
Tofu Linden 94bddd2b44 EXT-7479 FIXED only bumpmaps of type Brightness or Darkness load on 2.0.2 (205107) 2010-05-26 16:46:55 +01:00
Tofu Linden 9c779e222e merge from viewer-public 2010-05-20 11:47:15 +01:00
Mike Antipov 5d4b48bbb4 EXT-7104 WIP Implemented a functionality to control the width of the chat entry field.
* LLResizeBar calls notifyParent on resizing before changing rect of view, bottomtray processed this notification to update other buttons.
* Had to move setup of buttons visibility on startup into LLBottomTray to ensure all buttons have necessary visibility BEFORE restore the width of the chat entry field;
* Updated layout between chatbar and speak button to show resize mouse pointer in the middle between them.

Implemented behavior: visible buttons shrink to their minimal width when the chat entry field gets wider.

Also were refactored:
* moved declaration of settings related to buttons visibility from the settings.xml to LLBottomTray.
* moved setting of control listeners to LLBottomTray.

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/403/

--HG--
branch : product-engine
2010-05-19 15:23:51 +03:00
Tofu Linden 8b7563660c EXT-7154 FIXED revisted: darkness bumpmap looks like lightness bumpmap when deferred rendering is enabled
In addition to the previous bugs, the normal-map for *all* bumpmaps was also getting generated with its Y-gradient flipped, causing some odd and inconsistent results.
2010-05-14 16:36:39 +01:00
Tofu Linden 261f2d6054 EXT-7154 : FIXED : darkness bumpmap looks like lightness bumpmap when deferred rendering is enabled 2010-05-12 19:35:02 +01:00
Tofu Linden 3d39634cbd merge from viewer-public 2010-05-12 11:44:16 +01:00
Dave Parks 4a3222d9c1 Fix for fullbright bump not working in deferred render.
Fix for shadow artifacts around split frusta.
Tweak for shadow aliasing with projectors.
Fix for crash on exit in mesh thread.
(transplanted from 6dcf09cd3e524016c8130a0c8af3d9fc95f2d411)
2010-05-12 03:59:01 -05:00
Roxie Linden a11ec0c89f Automated merge 2010-05-04 16:09:14 -07:00
Tofu Linden b7a3582374 merge from viewer-trunk 2010-05-01 15:52:13 +01:00
Vadim Savchuk ccd4215fd4 Implemented task EXT-6559 (Appearance panel: Add edit button in place of the image display next to current look).
- Changed the topmost part of the Appearance panel:
  * Added new "Edit current outfit" button.
  * Implemented COF status display (unsaved/wearing) according to the spec.
  * Minor XUI changes (font / dimensions / bg color).
- Removed the temporary "Edit current outfit" button from the bottom of the Appearance panel.
- Removed the temporary "ShowDebugAppearanceEditor" setting.

TODO: use icons from the spec (currently missing).

Reviewed by Nyx at https://codereview.productengine.com/secondlife/r/339/

--HG--
branch : product-engine
2010-04-30 19:55:00 +03:00
Tofu Linden 9e51aa3fd6 EXT-7060 default auto alpha masking to ON for deferred rendering (only deferred rendering)
(transplanted from 050ae2c9451a6b89374c5a10403f373e2475f23b)
2010-04-26 14:42:06 +01:00
Aimee Linden 31e85ba276 Another small fix-up from backing out the SLE merge 2010-04-08 13:09:10 +01:00
Roxie Linden 8ba5517a08 Automated merge 2010-04-07 13:20:33 -07:00
Roxie Linden 658ccc3e85 Re-insert backed out SLE checkin so we can fix it 2010-04-07 11:08:04 -07:00
Tofu Linden 7efc691e26 merge from viewer-trunk 2010-04-09 11:25:45 +01:00
Tofu Linden ec0be66390 merged backout. 2010-04-07 10:40:38 +01:00
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden a7085418df Automated merge 2010-04-02 02:06:04 -07:00
Roxie Linden 9523c70f9d DEV-45809 - Merge Second Life Enterprise changes into viewer 2.x trunk
Includes: DEV-45800, DEV-45803 - Grid Manager
DEV-45804 - SLURL refactor
DEV-45801 - Single username field (for Identity Evolution and SLE Ldap)
Also,
Includes Certificate Management code allowing the viewer to connect to
grids not signed by a well know key (just like any web browser).  Also
contains secure storage for things like passwords.
The security/certificate code is modular with the intention of adding modules
to directly use the operating system facilities for crypto if available.
(that's much more secure than we'll ever be)

Also, refactor of voice to modularize it, and add a diamondware voice module.
CR:  Aimee, James, Lynx, Mani, Karina and a list of thousands
2010-04-02 02:03:21 -07:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Roxie Linden 947bd99488 Incorporate Aimees code review comments 2010-04-01 21:07:49 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Loren Shih cc4a9b5640 EXT-2959 : Pull out camera functions from llagent to llagentcamera
#2 checkin.

Superficial cleanup and some bug fixing (e.g. took out duplicate mDrawDistance from llagent, took out gAgentCameraHACK and gAgentHACK).
2010-03-24 16:12:01 -04:00
Tofu Linden dc8f5a7b03 Backed out changeset f196197a816a 2010-02-13 12:50:28 +00:00
Dave Parks fb830551d0 Tweak detail settings and make graphics preferences widget enabling respect requirements. 2010-03-20 16:56:36 -05:00
Dave Parks 32d0d01e86 RenderDeferredSSAO works as an independent setting -- decoupled shadows from SSAO. 2010-03-19 18:14:17 -05:00
Dave Parks b6a482e810 Replace RenderDeferredShadow/RenderDeferredSunShadow with RenderShadowDetail 2010-03-19 15:25:35 -05:00
Dave Parks eb5b0f2542 Optimiziation pass.
Added RenderUseStreamVBO to enable/disable usage of VBO's for streaming buffers.
Faster traversal of LLCullResult members.
Removal of llpushcallstacks from inner loops.
Sprinkling in fast timers.
2010-03-04 15:30:15 -06:00
Dave Parks adf601ef1f Draw prims using triangle strips instead of triangle lists. 2010-02-06 17:33:12 -06:00
Igor Borovkov ac0fb461f6 got rid of lloverlaybar, llmediaremotectrl, llvoiceremotectrl dependencies, updated cmake list
--HG--
branch : product-engine
2010-01-29 14:42:57 +02:00
Nyx (Neal Orman) ace0be2a7c merge with avp-tip
--HG--
branch : avatar-pipeline
2009-12-16 12:16:24 -05:00
Nyx (Neal Orman) 90bb29245c EXT-3514 update debug settings for new appearance features
following changes:
1) remove renderavatarinvisible - no longer need this debug setting
2) add showobjectrenderingcost (default:TRUE) so we can turn this feature off if necessary
3) add showdebugappearanceeditor (default:FALSE) so we can test the future appearance editor

code reviewed by vir and seraph

--HG--
branch : avatar-pipeline
2009-12-16 12:15:18 -05:00
Andrew Dyukov b6b861eaaf Fixed normal bug EXT-2724 (Mini map mimimizes underneath Nav bar when Favorites bar has been hidden) and
partially fixed EXT-2742 (Invalid menu appearance after hiding navigation bar and/or favorites bar). Problem
in fixed part of EXT-2742 was the same as the one which caused EXT-2724.

--HG--
branch : product-engine
2009-12-11 22:03:17 +02:00
Alexei Arabadji 4fc7b91a79 implemented EXT-2323 “Get rid from obsolete notification widgets”;
--HG--
branch : product-engine
2009-12-11 14:26:27 +02:00
Lynx Linden 98111a40ec DEV-43439: Created new LLVersionInfo API.
Renamed llviewerversion to llversioninfo, to avoid confusion with
llversionviewer in llcommon (llversion is already used by llwindow).

Created new LLVersionInfo class with the following methods:

        static S32 getMajor();
        static S32 getMinor();
        static S32 getPatch();
        static S32 getBuild();
        static const std::string &getVersion();
        static const std::string &getShortVersion();
        static const std::string &getChannel();

All viewer code has been updated to use this API. Viewer code no
longer directly includes llversionviewer.h from llcommon.
2009-12-08 14:56:19 +00:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
Steve Bennetts afe6350160 merge from texture-pipeline 2009-11-06 12:15:41 -08:00
Xiaohong Bao 35e200881c merge QAR-1829: texture pipeline branch in viewer-2.0.0.3 2009-11-06 06:52:24 +00:00
Andrew Dyukov 8298a1de68 Fixed normal bug EXT-1556(When the Navbar and Favbar are switched off, floaters still cannot be moved into the space they previously occupied)
--HG--
branch : product-engine
2009-10-29 17:47:09 +02:00
Adam Moss 406927f629 Merge a big bunch of fixes from maint-viewer. Hooray.
svn merge -r136066:136073 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-viewer/maint-viewer-24-qa-9

DEV-8553 New Server Tools - Prep Land For Sale
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-32942 (QAR-1521) Bad border crossings or TP / Ruthing issues
DEV-33239 VWR-13816: Resizing the Search Window Causes the Results to Refresh back to First Page
DEV-27746 Running a dev build of Second Life will make console window show up on non-dev builds (Windows)
DEV-33209 Linux 1.24.0.120778 client fails to run
DEV-29123 SVC-3871: Crash of viewer when clicking on ghost objects at (0,0,0) on a sim
DEV-35433 Attempting to upload wrong file type crashes viewer
DEV-33499 viewer2009 is not using KDU
DEV-33912 Griefing viewer crashes others' viewers with malformed sound files
DEV-3784 VWR-138: Animation Priority not working correctly, Can't create new AOs
DEV-20678 VWR-9069: Region variable says 'Region Name' in AR if no object is selected
DEV-19934 Help->About Second Life doesn't differentiate between 32- and 64-bit Vista
DEV-6604 Restored folders have 'Purge Item' and 'Restore Item' options
DEV-12867 VWR-5717: Selected Text is not replaced by Input text when Japanese IME is on
DEV-11894 Notecards/Texture windows don't open completely when opened from inventory
DEV-10641 VWR-4955: Local Chat doesn't show end of last conversation
DEV-30039 VWR-12620: Viewer build fails on Linux when compiled with -O2 (--type=Release)
DEV-20944 VWR-9065: (intermittent) Right Click >profile on avatar does not display profile
DEV-24828 Menu accelerator prefixes shouldn't be hard-coded
DEV-34529 VWR-14267: Clicking send in an IM window does not add the sent text to the line editor history
DEV-34124 Invite to group, search by name will not show resident if their first name is two characters
DEV-20930 VWR-9248: On Mac: the "--url" option causes a command line parsing error
DEV-35306 Adult keyword filter triggers multiple warnings
DEV-35503 VWR-3595: "Second Life requires True Color (32-bit) to run in a window" message is incorrect
DEV-35656 VWR-12995: FTBFS: error: format '%-3d' expects type 'int', but argument 3 has type 'size_t'
DEV-30043 VWR-12533: Linux viewer build for OpenAL fails during packaging unless FMOD library is available
DEV-31898 VWR-13202: Right clicking mouse triggers arrow key control events
DEV-32610 Keyboard shortcuts on OSX viewer overridden by OSX
DEV-27067 Coverity Prevent: EVALUATION_ORDER defects
DEV-26188 VWR-2242: Specially formatted .BVH file can cause avatar distortion
DEV-25475 About Land dialog no longer shows Area: field
DEV-19897 OSX Viewer Installer (for an RC) opens with poor positioning
DEV-22837 Inventory> Search Recent Items highlighting incorrect characters
DEV-21709 VWR-9377: Mapping will default to leave exact sim name listing first. (Searching Gar forces Gar to come up and not Garden of Dreams)
DEV-23079 implement volume serial for linux client
DEV-13930 VWR-6432: Space Navigator operation with vehicles is broken
DEV-27666 VWR-10829: Linux Viewer: CLICK_ACTION_PAY shows CLICK_ACTION_PLAY icon
DEV-23670 Viewer crashes on startup if installed into a custom folder with Korean, Japanese or Chinese characters in path
DEV-19313 VWR-8454: PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS not highlighted in script editor
DEV-19918 VWR-8885: Move character/*.xml files to source bundle
DEV-25555 VWR-11172: A source coding mistake prevents number-pad keys from specifying Ctrl+digit shortcuts on Windows
DEV-8536 VWR-4057: Multi-line chat display bug - first character in line missing
DEV-29592 Mac LLFastTimer uses wall clock instead of Intel PMU
DEV-29644 VWR-12587: Cmake install target has a hard coded secondlife-bin reference remaining
DEV-25320 VWR-11128: Python not always detected by develop.py
DEV-30040 VWR-12617: Poor type name that violates Coding Standard breaks compatibility with system header files
DEV-30380 indra/newview/res-sdl/toolpay.BMP is modified during ./develop.py configure
DEV-31247 VWR-12763: non-portable printf specifier used with size_t causes FTBFS on 64bit (due to -Werror)
DEV-29565 VWR-12569: A comment in lluistring.h contains undefined UTF-8 code sequences
DEV-22100 VWR-9620: send_parcel_select_objects in newview/llfloaterland.cpp uses the wrong datatype for the ReturnType field causing a warning
DEV-31911 Selected objects / primitives should be greyed out when nothing is selected
DEV-3667 Windows: Accelerator keys should be "Ctrl+X" rather than "Ctrl-X"
DEV-27223 disable gstreamer on 64-bit linux
DEV-8172 We Need a Linden Sale Option to Sell Land to Anyone
DEV-25511 VWR-10311: Enable LipSync by default
DEV-20443 Revamp group creation confirmation dialog to be more communicative
DEV-20132 VWR-7800: Joystick / SpaceNavigator. Camera should remain in position when exiting flycam mode into avatar mode.
DEV-18420 VWR-8393: Have build scripts copy fmod from an external location
DEV-24841 VWR-10717: Right Space Navigator button should toggle fly in avatar movment, not jump/flyup.
DEV-28457 change auto-populate value in buy L$ window from 1000 to 2000
DEV-15545 VWR-3725: Please add resize option to the SEARCH window UI
2009-10-14 10:40:56 +00:00