Commit Graph

121 Commits (5fa00a67af6364554c05eb3ca0339770fa6da455)

Author SHA1 Message Date
Tofu Linden 0bb3f144c0 Backed out changeset 63b699f90efd 2010-04-07 10:37:07 +01:00
Roxie Linden aa0a129b67 Automated Merge 2010-04-01 21:47:22 -07:00
Loren Shih 114e5ca083 EXT-5940 : Typedef all vector<LLUUID>'s
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
Loren Shih 58d76a9ecf EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "gAgentAvatar" with "gAgentAvatarp".
2010-03-29 12:11:51 -04:00
Loren Shih 94e6e10739 EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup to replace all instances of "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject" with "gAgentAvatar".
2010-03-29 12:00:26 -04:00
Loren Shih 46fe5d49ca EXT-6536 : Make LLVOAvatarSelf a singleton
Superficial cleanup so that all instances of gAgent.getAvatarObject() use "LLVOAvatarSelf *avatarp = gAgent.getAvatarObject".
2010-03-26 14:33:48 -04:00
Loren Shih 0a56031bd3 automated merge 2010-03-25 20:15:51 -04:00
Loren Shih fc49539b36 EXT-2959 : Full out camera functions from llagent to llagentcamera
First check-in; only compiles, nothing more.
2010-03-23 15:59:52 -04:00
Roxie Linden 18b7ab0018 Weekly automated merge from viewer 2.0 2010-03-22 16:12:41 -07:00
Loren Shih b952a5e585 EXT-6479 : Inspect Object floater doesn't update highlight and selection
EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset)

Simple fix to only use Inspect floater if it's actually active (i.e. visible).
2010-03-19 13:21:39 -04:00
Loren Shih 2a3c30dc7c EXT-6479 : Inspect Object floater doesn't update highlight and selection
EXT-4013 : Functionality loss: Inspect object (aka see a list of creators / timestamps for all prims in a linkset)

Very simple fix that addresses some brokenness with the inspect multi-object floater.
Nature of changes is that when we re-enabled the floater (i.e. uncommented the associated code) per last-minute request, a couple of blocks of code had been left commented out.
2010-03-19 11:48:00 -04:00
Dave Parks 4538bdd8e9 Fix for bad GL blend function caching. 2010-02-06 20:50:49 -06:00
Rick Pasetto 9dd41cdcee EXT-3144 EXT-4226: Re-employ tentative state for individual items in media settings
Review #95

This change undoes some prior change that seems to not allow showing
media data for multiple selection. There was all of this code put in
to support displaying tentative state for media, but code was added to
basically override it. Perhaps the reason was tentative state items
were not ignored on apply...this change does that.
2010-02-04 11:24:54 -08:00
Tofu Linden 3d8bd2b166 CID-351
Checker: UNINIT_CTOR
Function: LLSelectMgr::LLSelectMgr()
File: /indra/newview/llselectmgr.cpp
2010-01-28 11:52:38 -08:00
Tofu Linden bfd21c0886 CID-384
Checker: UNINIT_CTOR
Function: LLSelectNode::LLSelectNode(const LLSelectNode&)
File: /indra/newview/llselectmgr.cpp
2010-01-27 16:20:44 -08:00
Brad Payne (Vir Linden) 9813df87af merge
--HG--
branch : avatar-pipeline
2009-12-16 11:43:08 -05:00
Brad Payne (Vir Linden) adec0ba983 For EXT-3114: [BSI] Can't right click > edit a no-mod attachment
--HG--
branch : avatar-pipeline
2009-12-16 11:34:46 -05:00
Loren Shih 0d186b0712 Dos2Unix fix for llselectmgr.cpp 2009-12-10 14:03:19 -05:00
James Cook dab87201cd Partial EXT-3268 Object Profile option showing up in avatar 3D Context menu
Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no
longer pie menus.  Created separate other-attachment menus.
Reviewed with Richard.
2009-12-09 16:37:08 -08:00
James Cook 3476116de8 EXT-2827 and fix for delete key not deleting objects while building.
Object inventory was grabbing edit menu handling during refresh.
Put back Angela's code so that Right-click > Remove > Delete
is now disabled if you have a single face selected.  Fixed
LLSelectMgr::contains() for SELECT_ALL_TES case.
Reviewed with Richard.
2009-12-09 13:06:07 -08:00
James Cook a65473957f Back out EXT-2827 Unable to delete object when select face of object
May cause right-click delete to fail - testing that
Backed out changeset: 1f8e1e73f9f4
2009-12-08 16:28:34 -08:00
Roxie Linden b11a625e6f Automated merge with a few fixups for code review comments 2010-03-01 15:31:04 -08:00
Roxie Linden a2efe4bb41 automated merge 2010-02-26 19:18:15 -08:00
Roxie Linden 9b05fecbf6 automated merge from trunk 2010-02-25 18:24:07 -08:00
angela 5d4959e3a1 EXT-2827 Unable to delete object when select face of object 2009-12-04 22:25:12 +08:00
James Cook 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
James Cook f280c43d61 Use extern template for common singletons to reduce code bloat/link time. 2009-11-28 16:51:02 -08:00
James Cook 458430be91 Removed include llnotifications.h from llfloater.h trying to speed builds
Fixed many other includes related to this file.
Cleaned out llfloatertestlistview to be an empty test floater.
2009-11-24 22:13:10 -08:00
Loren Shih 9c048d12fd merge
--HG--
branch : avatar-pipeline
2009-11-06 18:31:52 -05:00
Monroe Linden 44fc2e5ba3 Restore the media focus ring. This fixes DEV-42166.
Media focus is still tracked separately from LLSelectMgr (which was a change made during a refactor a while ago), but LLViewerMediaFocus now keeps LLSelectMgr updated with the current media focus when it changes.

Added a special case for media focus to LLSelectMgr::deselectAllIfTooFar(), since it was making the focus ring not show up when media focus was on distant media.
2009-11-05 14:18:16 -08:00
Loren Shih 280e017291 EXT-2229 : Task SP : Update task on new selection
Using activePanel hack to update selection when it changes.

--HG--
branch : avatar-pipeline
2009-11-05 15:00:36 -05:00
Bryan O'Sullivan b806edf4ac Redo Bao's broken merge 2009-11-04 14:59:23 -08:00
Xiaohong Bao abf77532d8 fix the bug that textuer boost level is mixed with boolean numbers. 2009-11-03 19:42:52 -07:00
Leyla Farazha 43c5ab0be2 EXT-1744 1-click Sit object not spawning an object inspector
EXT-1810   	 Right clicking own avatar displayed semi-transparent menus
EXT-1927   	 Hook up Push-to-talk in Preferences > Advanced
reviewed by richard
2009-11-02 14:11:07 -08:00
Steve Bennetts 65bf35cfed merge 2009-10-19 10:49:48 -07:00
Mark Palange (Mani) b4275c5d48 merge 2009-10-16 18:13:53 -07:00
James Cook a4c657a49d Group inspectors now work. They are hooked up to About Land, build tools floater, and anywhere secondlife:///app/group URLs appear. Reviewed with Leyla. 2009-10-16 23:20:05 +00:00
Loren Shih 89d92267e2 svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/avatar-pipeline-multiattachments-3 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-32867 : Avatar Pipeline Project - Multi-Attachments

This is a viewer-side-only, infrastructure-only merge for multi-attachments.  This should not lead to any new functionality; it simply provides backwards compatibility for when multi-attachments are enabled in viewer2.1, so that viewer2.0 users can see viewer2.1 avatars correctly.

Reviewed by: Vir.
2009-10-16 21:41:31 +00:00
Monroe Linden 86787b58ed Major refactor of LLViewerMediaFocus and LLPanelMediaHUD.
LLViewerMediaFocus now tracks two separate objects:  the currently focused media object, and the media object that's currently being hovered over.  It no longer stores smart pointers to either the LLViewerObject or the LLViewerMediaImpl -- it now looks up both by UUID every time they're needed, and fails gracefully if either goes away.  This will prevent it from keeping objects from being deleted.

The poorly-understood "mouseOverFlag" has been expunged.

LLViewerMediaFocus no longer uses LLSelectMgr at all.  The object to focus on is explicitly passed between LLViewerMediaFocus and LLPanelMediaHUD instead of going indirectly through the selection manager.

LLViewerMediaFocus also no longer interacts with the pick from LLToolPie -- the data it needs from the pick (the object and normal vector) is passed explicitly.

LLViewerMediaFocus::setCameraZoom and LLViewerMediaFocus::getBBoxAspectRatio now have no dependencies on the LLViewerMediaFocus object -- all the data they need is passed in when they're called by the LLPanelMediaHUD.  I made them static member functions, but they could be moved to LLPanelMediaHUD or even made into file-scoped static functions.  The only reason I didn't do either of those is that it seems like they belong with the LLViewerMediaFocus code as opposed to the HUD.
2009-10-15 18:42:30 -07: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
James Cook ada0f4fa22 Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml

Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
2009-10-03 23:40:28 +00:00
Monroe Williams cf9239cabc svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-10-01 02:35:53 +00:00
Richard Nelson 58bce2d205 merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1 2009-09-09 01:26:44 +00:00
Monroe Williams 745845f799 svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/pluginapi_05-merge@129910
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05

Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
2009-08-27 19:00:18 +00:00
Richard Nelson eb853f55c0 svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-18 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 2009-08-04 01:12:59 +00:00
Xiaohong Bao 77f56a3f3d merge QAR-1579: texture-cleanup-1. 2009-07-10 22:02:26 +00:00
Roxanne Skelly 7a64aad1de DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling
ignore dead branch
2009-07-09 20:56:23 +00:00
James Cook 52aeaa3284 Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
2009-07-07 00:53:05 +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
Steven Bennetts 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