fd04b26d34
automated merge
2010-04-02 13:14:12 -04:00
36987904d4
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-04-02 10:40:48 -06:00
8cd95bd12a
add some debug code for EXT-5394: Crash in LLViewerMediaImpl::calculateInterest()
2010-04-02 10:33:20 -06:00
873de2daae
automated merge
2010-04-02 12:32:56 -04:00
580ecaefca
EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
...
Moved a bunch of local llinventorybridge functions into .cpp.
Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02 11:56:52 -04:00
825e4df30d
EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanup
...
Moved a bunch of local llinventorybridge functions into .cpp.
Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-04-02 11:12:59 -04:00
a7085418df
Automated merge
2010-04-02 02:06:04 -07:00
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
aa0a129b67
Automated Merge
2010-04-01 21:47:22 -07:00
947bd99488
Incorporate Aimees code review comments
2010-04-01 21:07:49 -07:00
18d9efff12
another fix for bad merge
2010-04-01 16:43:58 -07:00
a9b806071a
fix for bad merge
2010-04-01 16:41:45 -07:00
be16153af8
added newline at eof
2010-04-01 16:19:03 -07:00
f252d0d1a0
merge
2010-04-01 15:51:24 -07:00
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
51e1c6b78a
merge
2010-04-01 15:46:34 -07:00
ca8da832bd
fixed line endings
2010-04-01 15:35:55 -07:00
db0ffdf270
Merge
2010-04-01 15:33:05 -07:00
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
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
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
b6109c4645
EXT-5168 prefs review: Remove "Small nametags" option
...
reviewed by Richard cc#176
2010-04-01 15:10:30 -07:00
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
39ef9e9dd6
EXT-6492 - button halign=center doesn't take into account left and right pad
2010-04-01 14:56:53 -07:00
2854008e8e
automated merge
2010-04-01 17:54:08 -04:00
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
2be2fdca5c
EXT-3606 - Script editor window: next line not indenting if current line wraps
2010-04-01 14:08:49 -07:00
09add95e31
EXT-6307 World Map: field of view triangle rotates
...
reviewed by Leyla
2010-04-01 13:42:42 -07:00
6cc65f9e5f
merge
2010-04-01 12:52:04 -07:00
df45c16169
removed unused textures
...
reviewed by Erica
2010-04-01 12:49:23 -07:00
656a533fac
EXT-6431 - Avatar head doesn't correctly follow mouse when side panel is open
2010-04-01 12:41:41 -07:00
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
bb4c1384ac
EXT-3531 - Ctrl-P does not work reliably on login
...
forgot menu_edit.xml
2010-04-01 12:05:17 -07:00
406b595e8c
fixed build
2010-04-01 11:51:06 -07:00
7b4046df83
EXT-3531 - Ctrl-P does not work reliably on login
2010-04-01 11:47:21 -07:00
19be852fd6
Automated merge
2010-04-01 11:47:20 -07:00
12a1c0aa8b
EXT-6680 : [INFRASTRUCTURE] Change LLInventoryPanel "LLFolderView* mFolders" to "LLFolderView* mRootFolder"
...
Superficial member variable name changes.
2010-04-01 14:41:12 -04:00
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
309d94452b
fix for EXT-6678: crash at LLTextureCache::openAndReadEntry [secondlife-bin lltexturecache.cpp:1111]
2010-04-01 11:39:01 -06:00
ab79bf7aae
Checker: CHECKED_RETURN
...
Function: LLViewerMediaImpl::createMediaSource()
File: /indra/newview/llviewermedia.cpp
2010-04-01 17:34:26 +01:00
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
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
fb08c17cdd
Checker: UNINIT_CTOR
...
Function: LLAgentCamera::LLAgentCamera()
File: /indra/newview/llagentcamera.cpp
2010-04-01 17:25:42 +01:00
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
569f322f0d
PE merge
2010-04-01 17:12:12 +01:00
8421d3dcd3
PE merge
2010-04-01 17:01:08 +01:00
7cce085480
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
2010-04-01 11:24:23 -04:00
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
045fb06137
automated merge
2010-04-01 10:44:07 -04:00
b98ebdecda
Fixed reopened major bug (EXT-5106) Side panel list view toolbars are missing background art.
...
- Made toolbars look connected to the respective lists.
- Fixed tab container background in Inventory side panel.
Tab container reserves 1 pixel for the border width so we have to use top_pad="-1" to move the toolbar 1 pixel up to physically connect them.
--HG--
branch : product-engine
2010-04-01 17:24:50 +03:00
Loren Shih