Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Roxie Linden 947bd99488 Incorporate Aimees code review comments 2010-04-01 21:07:49 -07:00
Richard Linden 18d9efff12 another fix for bad merge 2010-04-01 16:43:58 -07:00
Richard Linden a9b806071a fix for bad merge 2010-04-01 16:41:45 -07:00
Richard Linden be16153af8 added newline at eof 2010-04-01 16:19:03 -07:00
Richard Linden f252d0d1a0 merge 2010-04-01 15:51:24 -07:00
Richard Linden dcc5e0a4fa EXT-3531 - Ctrl-p doesn't work reliably on login
moved gEditMenuHandler handling to LLEditMenuHandler destructor
2010-04-01 15:48:56 -07:00
Richard Nelson 51e1c6b78a merge 2010-04-01 15:46:34 -07:00
Leyla Farazha ca8da832bd fixed line endings 2010-04-01 15:35:55 -07:00
Leyla Farazha db0ffdf270 Merge 2010-04-01 15:33:05 -07:00
Brad Payne (Vir Linden) cec9bce226 Cleanup and consolidation 2010-04-01 18:18:00 -04:00
Leyla Farazha 959ec0c305 EXT-3792 Legacy menus are still displayed in Inventory in Inventory side panel
reviewed by Richard CC#176
2010-04-01 15:13:03 -07:00
Leyla Farazha 8a22ffa622 EXT-5110 Save Outfit dialog is non-standard modal dialog (off-center placement, empty titlebar)
reviewed by Richard CC#176
2010-04-01 15:12:20 -07:00
Leyla Farazha 38c1bc9e9a EXT-5179 In Prefs->Setup, move Other Devices to bottom of window or to advanced EXT-5170 prefs review: move UI size to advanced
reviewed by Richard CC#176
2010-04-01 15:11:13 -07:00
Leyla Farazha b6109c4645 EXT-5168 prefs review: Remove "Small nametags" option
reviewed by Richard cc#176
2010-04-01 15:10:30 -07:00
Leyla Farazha 1d0f98f075 EXT-5584 color picker swatches are missing pure red and many common shades
reviewed by Richard cc#176
2010-04-01 15:08:17 -07:00
Richard Linden 39ef9e9dd6 EXT-6492 - button halign=center doesn't take into account left and right pad 2010-04-01 14:56:53 -07:00
Loren Shih 2854008e8e automated merge 2010-04-01 17:54:08 -04:00
Loren Shih 1ec47c39a6 EXT-6679 : INFRASTRUCTURE : Have LLInvFVBridge contain a LLFolderView *mRoot instead of passing it along everywhere such as in performAction
mRoot is now stored for all LLInventoryBridge types.
Did some superficial formatting cleanup for LLInventoryBridge.
2010-04-01 17:50:48 -04:00
Sergei Litovchuk 3962ca7a0b Low bug (EXT-6677) Crash when selecting empty outfit edit panel
- Added NULL check for selected item pointer.

Reviewed by Neal Orman https://codereview.productengine.com/secondlife/r/162/

--HG--
branch : product-engine
2010-04-02 00:43:32 +03:00
Brad Payne (Vir Linden) e45040412c Cleanup and consolidation 2010-04-01 17:26:25 -04:00
Richard Linden 2be2fdca5c EXT-3606 - Script editor window: next line not indenting if current line wraps 2010-04-01 14:08:49 -07:00
Brad Payne (Vir Linden) 39308422f1 Cleanup and consolidation 2010-04-01 17:05:25 -04:00
Richard Linden 09add95e31 EXT-6307 World Map: field of view triangle rotates
reviewed by Leyla
2010-04-01 13:42:42 -07:00
Eli Linden 9cf97ccd33 fix bad xml; IT linguistic 2010-04-01 13:39:41 -07:00
Richard Nelson 6cc65f9e5f merge 2010-04-01 12:52:04 -07:00
Richard Nelson df45c16169 removed unused textures
reviewed by Erica
2010-04-01 12:49:23 -07:00
Richard Nelson 656a533fac EXT-6431 - Avatar head doesn't correctly follow mouse when side panel is open 2010-04-01 12:41:41 -07:00
Richard Nelson e254aa6dc6 EXT-3531 - Ctrl-P does not work reliably on login
deprecated handle_edit_keys_directly and moved edit menu out of menu_viewer and menu_login
2010-04-01 12:06:16 -07:00
Richard Nelson bb4c1384ac EXT-3531 - Ctrl-P does not work reliably on login
forgot menu_edit.xml
2010-04-01 12:05:17 -07:00
Richard Linden 406b595e8c fixed build 2010-04-01 11:51:06 -07:00
Richard Nelson 7b4046df83 EXT-3531 - Ctrl-P does not work reliably on login 2010-04-01 11:47:21 -07:00
Roxie Linden 19be852fd6 Automated merge 2010-04-01 11:47:20 -07:00
Loren Shih 12a1c0aa8b EXT-6680 : [INFRASTRUCTURE] Change LLInventoryPanel "LLFolderView* mFolders" to "LLFolderView* mRootFolder"
Superficial member variable name changes.
2010-04-01 14:41:12 -04:00
Loren Shih 5372782d50 EXT-4084 : Change LLInventoryBridge "LLFolderView* folder" to "LLFolderView *rootFolder"
Superficial cleanup - changed all instances to "LLFolderView* root".
2010-04-01 14:29:23 -04:00
Vadim Savchuk 0d7d486f8f Fixed bug EXT-6337 (Changing maturity settings in preferences floater only works on first floater spawn when account is not age verified).
I'm actually copying an existing fix from the viewer-hotfix branch. See the ticket for more details.

Not reviewed.

--HG--
branch : product-engine
2010-04-01 21:22:12 +03:00
Xiaohong Bao 309d94452b fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin lltexturecache.cpp:1111] 2010-04-01 11:39:01 -06:00
Tofu Linden ab79bf7aae Checker: CHECKED_RETURN
Function: LLViewerMediaImpl::createMediaSource()
File: /indra/newview/llviewermedia.cpp
2010-04-01 17:34:26 +01:00
Xiaohong Bao 990011f3d6 make LLImageBase::allocateData() thread-safe.
insert debug code for EXT-6567: crash at LLImageBase::allocateData [secondlife-bin llimage.cpp:170]
2010-04-01 10:30:27 -06:00
Tofu Linden 03322a8e87 Checker: UNINIT_CTOR
Function: LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID &, unsigned char, LLViewerRegion *)
File: /indra/newview/llvoavatarself.cpp
2010-04-01 17:29:08 +01:00
Tofu Linden fb08c17cdd Checker: UNINIT_CTOR
Function: LLAgentCamera::LLAgentCamera()
File: /indra/newview/llagentcamera.cpp
2010-04-01 17:25:42 +01:00
Tofu Linden 56dbd313a1 Checker: CHECKED_RETURN
Function: LLAgentCamera::updateCamera()
File: /indra/newview/llagentcamera.cpp

not a bug, but I cleaned up BOOL->bool
2010-04-01 17:23:49 +01:00
Vadim Savchuk 4a9567d749 Minor optimization: removed reduntant getChild() calls. Not reviewed.
--HG--
branch : product-engine
2010-04-01 19:23:09 +03:00
Tofu Linden 569f322f0d PE merge 2010-04-01 17:12:12 +01:00
Tofu Linden 8421d3dcd3 PE merge 2010-04-01 17:01:08 +01:00
Eugene Mutavchi 5db663c87e Partial fix for normal bug EXT-6612 (End Call button in 1:1 IMs should be labeled End Call (not Leave Call))
--HG--
branch : product-engine
2010-04-01 18:47:35 +03:00
Nyx (Neal Orman) 7cce085480 Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk 2010-04-01 11:24:23 -04:00
Nyx (Neal Orman) 6eeb4247bb updating some back-end functionality that will come in handy as we bring the UI up to date with multiwearables.
code reviewed by Seraph and Vir.
2010-04-01 11:24:04 -04:00
Dmitry Zaporozhan 08a2242ceb Fixed windows build
--HG--
branch : product-engine
2010-04-01 18:20:34 +03:00
Loren Shih 045fb06137 automated merge 2010-04-01 10:44:07 -04:00
Dmitry Zaporozhan 3c036ef49b (work in progress) EXT-6564(major) - Fix wearable editing panels
Fixed Edit Shape panel layout:
- fixed widget positioning according to spec
- added gear button bar
- fixed accordion positioning
- fixed parameter list positioning

TODO:
- fix parameter panel positioning
- apply changes to the rest of wearable panels

Reviewed by Vadim Savchuk - https://codereview.productengine.com/secondlife/r/149/

--HG--
branch : product-engine
2010-04-01 17:41:47 +03:00